13891 - combine everything into one patch
make the 2-line change to GenericGraph.plot as suggested by slabbe