edits
Merge pull request #917 from kerautret/ChangelogEdit

edits