Merge remote-tracking branch 'origin/master'
diff --git a/gremlin-server/conf/gremlin-server-classic.yaml b/gremlin-server/conf/gremlin-server-classic.yaml
index 2679087..142b693 100644
--- a/gremlin-server/conf/gremlin-server-classic.yaml
+++ b/gremlin-server/conf/gremlin-server-classic.yaml
@@ -10,7 +10,7 @@
   - [org.apache.commons, commons-math3, "3.2"]
 scriptEngines: {
   gremlin-groovy: {
-    imports: [java.lang.Math, org.apache.commons.math3.util.FastMath],
+    imports: [com.tinkerpop.gremlin.tinkergraph.structure.*, com.tinkerpop.gremlin.tinkergraph.process.computer.*,java.lang.Math, org.apache.commons.math3.util.FastMath],
     staticImports: [java.lang.Math.PI],
     scripts: [scripts/generate-classic.groovy]}}
 serializers:
diff --git a/gremlin-server/conf/gremlin-server-min.yaml b/gremlin-server/conf/gremlin-server-min.yaml
index 5f3ecc0..fa2855d 100644
--- a/gremlin-server/conf/gremlin-server-min.yaml
+++ b/gremlin-server/conf/gremlin-server-min.yaml
@@ -10,7 +10,7 @@
   - [org.apache.commons, commons-math3, "3.2"]
 scriptEngines: {
   gremlin-groovy: {
-    imports: [java.lang.Math, org.apache.commons.math3.util.FastMath],
+    imports: [com.tinkerpop.gremlin.tinkergraph.structure.*, com.tinkerpop.gremlin.tinkergraph.process.computer.*, java.lang.Math, org.apache.commons.math3.util.FastMath],
     staticImports: [java.lang.Math.PI]}}
 serializers:
   - { className: com.tinkerpop.gremlin.driver.ser.KryoMessageSerializerV1d0 }
diff --git a/gremlin-server/conf/gremlin-server-neo4j.yaml b/gremlin-server/conf/gremlin-server-neo4j.yaml
index c265523..1cf9002 100644
--- a/gremlin-server/conf/gremlin-server-neo4j.yaml
+++ b/gremlin-server/conf/gremlin-server-neo4j.yaml
@@ -12,7 +12,7 @@
   - [org.apache.commons, commons-math3, "3.2"]
 scriptEngines: {
   gremlin-groovy: {
-    imports: [java.lang.Math, org.apache.commons.math3.util.FastMath],
+    imports: [com.tinkerpop.gremlin.tinkergraph.structure.*, com.tinkerpop.gremlin.tinkergraph.process.computer.*, java.lang.Math, org.apache.commons.math3.util.FastMath],
     staticImports: [java.lang.Math.PI]},
   nashorn: {
       imports: [java.lang.Math, org.apache.commons.math3.util.FastMath],
diff --git a/gremlin-server/conf/gremlin-server.yaml b/gremlin-server/conf/gremlin-server.yaml
index ceb6e91..5e7e52f 100644
--- a/gremlin-server/conf/gremlin-server.yaml
+++ b/gremlin-server/conf/gremlin-server.yaml
@@ -11,7 +11,7 @@
   - [org.apache.commons, commons-math3, "3.2"]
 scriptEngines: {
   gremlin-groovy: {
-    imports: [java.lang.Math, org.apache.commons.math3.util.FastMath],
+    imports: [com.tinkerpop.gremlin.tinkergraph.structure.*, com.tinkerpop.gremlin.tinkergraph.process.computer.*, java.lang.Math, org.apache.commons.math3.util.FastMath],
     staticImports: [java.lang.Math.PI]},
   nashorn: {
       imports: [java.lang.Math, org.apache.commons.math3.util.FastMath],
diff --git a/gremlin-server/src/test/resources/com/tinkerpop/gremlin/server/gremlin-server-integration.yaml b/gremlin-server/src/test/resources/com/tinkerpop/gremlin/server/gremlin-server-integration.yaml
index fa17d69..7fd1e45 100644
--- a/gremlin-server/src/test/resources/com/tinkerpop/gremlin/server/gremlin-server-integration.yaml
+++ b/gremlin-server/src/test/resources/com/tinkerpop/gremlin/server/gremlin-server-integration.yaml
@@ -10,7 +10,7 @@
   - [org.apache.commons, commons-math3, "3.2"]
 scriptEngines: {
   gremlin-groovy: {
-    imports: [java.lang.Math, org.apache.commons.math3.util.FastMath],
+    imports: [com.tinkerpop.gremlin.tinkergraph.structure.*, com.tinkerpop.gremlin.tinkergraph.process.computer.*, java.lang.Math, org.apache.commons.math3.util.FastMath],
     staticImports: [java.lang.Math.PI],
     scripts: [scripts/sample.groovy]},
   nashorn: {
diff --git a/gremlin-server/src/test/resources/com/tinkerpop/gremlin/server/gremlin-server-performance.yaml b/gremlin-server/src/test/resources/com/tinkerpop/gremlin/server/gremlin-server-performance.yaml
index 63413ba..f635b3d 100644
--- a/gremlin-server/src/test/resources/com/tinkerpop/gremlin/server/gremlin-server-performance.yaml
+++ b/gremlin-server/src/test/resources/com/tinkerpop/gremlin/server/gremlin-server-performance.yaml
@@ -10,7 +10,7 @@
   - [org.apache.commons, commons-math3, "3.2"]
 scriptEngines: {
   gremlin-groovy: {
-    imports: [java.lang.Math, org.apache.commons.math3.util.FastMath],
+    imports: [com.tinkerpop.gremlin.tinkergraph.structure.*, com.tinkerpop.gremlin.tinkergraph.process.computer.*,  java.lang.Math, org.apache.commons.math3.util.FastMath],
     staticImports: [java.lang.Math.PI],
     scripts: [scripts/generate-sample.groovy]},
   nashorn: {