Fix CHANGES.txt - for got to rebase *first*.
Fix wrong version in changes.
Bump version.
Merge branch 'release/0.2.6'

* release/0.2.6:
  Bump version.
Bump version