Update CHANGES.md
Merge remote branch 'upstream/master' into rose-macro-args