Changed to version 1.1
Merge branch 'release_1_1'