Bumped version for release of 3.12.1
Merge branch 'release/3.12.1' into develop
Bumped version for development after release.