Merge pull request #2188 from reaperhulk/improve-changelog

Improve changelog