Prepare for 2.6.0 release
Change to latest version
Merge branch 'release/2.6.0' into develop