Update version number to 2.6.1rc1
Merge remote-tracking branch 'origin/master' into 2.6.1
Update CHANGES.txt for 2.6.1rc1.
Update version number in generated files.
Update CHANGES.txt to include a bug fix.