Version 2.7-dev
Merge pull request #393 from pgiraud/2.7-dev

Version 2.7-dev