merging changelog
oops added a tag
Merge pull request #1766 from Cheridan/master

Fixing fleure's changelog