Version bump for the release
Update ChangeLog
Merge to 2.2.11a