Update changelog
Merge pull request #1207 from nylen/update-changelog-2

Update changelog