Merge branch 'release 1.1.0' into master