gvt gem fixes

Chris Wilson
2016-10-19T10:11:54Z

I think this is the set required to bring gvt into line, at least to
unblock myself.
-Chris