Edits again
Merge pull request #849 from dcoeurjo/Changelogup

Edits again