Fixed compile errors.
Bumped version for release of 1.2.12
Merge branch 'release/1.2.12' into develop
Bumped version for development after release.