Update CHANGELOG.md
Merge branch 'master' into develop