Changelog cleanup
Merge pull request #2350 from rarila/changelog-ocd

Changelog cleanup...  Too bloody right, mate!