Release 1.1.1
Merge branch 'release-1.1.1' into develop
Match develop to 1.2-SNAPSHOT