...
Merge branch 'reverting-to-ff-2.6' of git://github.com/algorithmica/geograph into reverting-to-ff-2.6