Update changelog in master.
 Merge branch 'update-changelog' into 'master'

Update changelog