Added release 1.1
Merge branch 'release_1.1' into develop