changelog for #728
Merge remote-tracking branch 'upstream/releases'