Update CHANGELOG.md
Merge branch 'develop'