Bump assembly number for a new release
Merge branch 'master' into master-horizontal