Fix changelog
Merge pull request #437 from titilambert/upstream

Fix changelog