Update ChangeLog
Merge branch 'release' into upstream