Merge pull request #552 from smillidge/2.6-maintenance

Create 2.6.x maintenance branch