adding 2.6 to master branch