Merge pull request #1485 from madig/update-changelog

Update changelog [skip ci]