My changelog; master changelog to avoid conflicts.
Merge pull request #5107 from Jarcolr/patch-1

My changelog and master changelog to avoid conflicts.