Updated the changelog. Insta-merge please.