Merge branch 'release/1.0.12' into develop
Prep for release
Merge branch 'release/1.0.13'