bump version
Add CHANGES entry
Merge branch 'master' into uber_branch