Update changelog.md
Update changelog.md
Merge remote-tracking branch 'origin/master' into next-release