Merge branch 'release/1.1.0' into develop
Composer compat
Merge branch 'release/1.1.1'