Update changelog. Fixes #4085.
Merge pull request #4098 from pchote/changelog

Update changelog. Fixes #4085.