Version 2.6.0-specific changes for release

Changes specific for release 2.6.0.