Fix CHANGES.txt - for got to rebase *first*.