Set version to 2.6
Merge branch 'origin/master'