Sync with 1.5
Update ChangeLog
Merge pull request #1322 from emmanuel-keller/master

Update ChangeLog