Update ChangeLog and version to 3.6