Update CHANGES.md
Merge branch 'master' into 13.rose-version