bumped release
Merge branch 'release/2.6.0' into develop
2.7.0 ready for development