Collect changes on the same file
Merge pull request #843 from camptocamp/changelog5

Collect changes on the same file