Moar changes
Merge pull request #678 from jimis/master

Changelog update.