Merge branch 'master' into develop
Version bump to 0.3.12
bump commit
build commit
Merge branch 'release-0.3.12'