Bump version to 2.6.0.
Merge remote-tracking branch 'fool/master'