Updated version to 2.6
Merge branch 'release/2.6' into develop