Changelog updated. Insta-merge please.