Update changelog for release
Merge pull request #822 from Cadair/master

Update changelog for release