diff --git a/build.gradle b/build.gradle
index cdca940289..cba960a92d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -409,15 +409,17 @@ task distributionZip (type: Zip , dependsOn: ['singleJar', 'copyJars', 'manual']
  /*
   * Get the plume-lib repo using gradle-git, and save into utils/plume-lib
   */
- task clone << {
-   def plumeFolder = file("$buildDir/utils/plume-lib")
-   if ( ! plumeFolder.exists() ) {
-     org.ajoberstar.grgit.Grgit.clone(dir: plumeFolder, uri: 'https://github.com/mernst/plume-lib.git')
-   } else {
-     println("WARNING: not cloning plume-lib because already exists.")
-     println("         Force clone by running after clean")
-   }
- }
+task clone {
+  doLast {
+    def plumeFolder = file("$buildDir/utils/plume-lib")
+    if ( ! plumeFolder.exists() ) {
+      org.ajoberstar.grgit.Grgit.clone(dir: plumeFolder, uri: 'https://github.com/mernst/plume-lib.git')
+    } else {
+      println("WARNING: not cloning plume-lib because already exists.")
+      println("         Force clone by running after clean")
+    }
+  }
+}
 
 /*
  * Set destination directory to build/docs/api, and restrict to classes in
@@ -557,7 +559,7 @@ task buildRelease(type: DefaultTask, dependsOn: [ 'build', 'publishSite', 'valid
 /* Declares the Gradle version to be used when the wrapper is built */
 task wrapper(type: Wrapper) {
   description "Configure Gradle Wrapper for this project"
-  gradleVersion = '3.0'
+  gradleVersion = '3.2.1'
 }
 
 /*************** Other tool configs *************/
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 3baa851b28..deedc7fa5e 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index dbd48c6938..a81e25f6c8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Aug 29 14:58:08 PDT 2016
+#Tue Dec 13 07:22:55 PST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-bin.zip
diff --git a/gradlew b/gradlew
index 27309d9231..9aa616c273 100755
--- a/gradlew
+++ b/gradlew
@@ -161,4 +161,9 @@ function splitJvmOpts() {
 eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
 JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
 
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
+  cd "$(dirname "$0")"
+fi
+
 exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
index f6d5974e72..e95643d6a2 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -49,7 +49,6 @@ goto fail
 @rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line