Bump build number to 12 - Automated build by Bamboo
Merge branch 'build-12' into develop