Changelog re #199, fixes #199
Merge branch '1.10' into 1.11
Clone 1.10.4 items to 1.11.2
Merge branch '1.11'