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