Update ChangeLog
Merge branch 'develop'