Update version number to 2.6.1.
Merge changes from 2.6.1 release branch.