Adjusted building.
Bumped build number to 12
Merge branch 'master' into develop