Changelog update
Merge branch 'release-1.1-b' into develop