Update CHANGES.md
Merge branch 'master' into rose-bush
Merge branch 'rose-bush' of github.com:matthewrmshin/rose into rose-bush