incremented version to 2.6.9
Merge branch 'future'