Reset changelog.
Merge branch 'master' into monson-dev
Update changelog.