Merge branch 'release/1.1.1' into 'stable'