2.6 and 2.7 versions
Merge pull request #2393 from andymckay/deux-versions

2.6 and 2.7 versions