Merge 1.1.0 from branch 'release'