Changelog entry for 1.0.9
Merge branch '1.0.x' into 1.1.x
Changelog entry for 1.1.6
Merge branch '1.1.x'