Merge branch 'TINKERPOP-2513'