Version 2.6-dev
Merge pull request #343 from pgiraud/2.6-dev

Version 2.6-dev