Update the version to 1.1.1
Merge branch 'hotfix-1.1.1'
Merge branch 'master' into develop