Changelog fixes #290
Merge branch '1.11' into 1.12