Merge branch 'release-v1.1.0'