Updated version to 2.6
Merge branch 'master' into develop