Merge branch 'release-1.1'
bump to 1.1.1
Merge branch 'hotfix-1.1.1' into develop