Changelog for #2071. Insta-merge please.