Merge branch 'ss/howto-manage-trunk'