Whitellama's changelog merge.
I hate the changelog.
Merge pull request #3192 from Zuhayr/feature

Whitellama's changelog merge.