Merge pull request #793 from jmaas/master

Bump version to 2.7.0 as 2.6 has been branched already