Update CHANGES.md
Merge branch 'master' into inherit