Merge remote-tracking branch 'upstream/master'
Update changelog.
Merge branch 'master' into master-2