Fix a use of typename outside of template.  Looks like a merge
from develop omitted this as it's fixed in develop, not in
master.

This should clear master graph tests on Darwin and Linux.
Merge branch 'develop'