Merge branch 'release/1.0.11' into develop
Bill's changes
bump to version 1.0.12
Merge branch 'release/1.0.12'