Update ChangeLog and version to 6.0