Bumped the master branch to 2.6