Merge branch 'release/1.1.0.0' into develop
Bumped version number
Merge branch 'release/1.2.0.0'