Update CHANGES.md
Merge remote-tracking branch 'upstream/master' into rose-bush