Update ChangeLog
Merge branch 'bug/changelog'