Updated the changelog.
Merge pull request #2361 from Giacom/changelog_6

Updated the changelog. Insta-merge please.