Merge avondrak's graphviz branch.