Merge branch 'release-1.1' into develop
new feature
bumped version number
Merge branch 'release-1.2'