Changelog proof-read and corrected.
Merge remote-tracking branch 'upstream/master'