Update ChangeLog
Merge pull request #1321 from emmanuel-keller/1.6

Update ChangeLog