Update changelog.
Merge branch 'develop'