Update changelog for #6267
Merge pull request #6276 from robertd/update_changelog

Update changelog for #6267