Preparing for release
Merge branch 'release/1.1.1' into develop