Merge pull request #2005 from danielcweber/FixTINKERPOP-2918

Attempt to fix TINKERPOP-2918.