Updating CHANGES file to add fixes and features from the development trunk