Merge branch 'release/1.1.5' into 'stable'