Update for 2.6.0 release.