Update short bundle version string
Merge branch 'develop'