Merge branch 'release_1.1'