Merge branch 'ogdf'