Merge branch 'version-1.1.0'