Update ChangeLog
Merge to 2.2.1