Changelog for #1055, fix #1050