Update ChangeLog
Merge remote-tracking branch 'clone/master'