diff --git a/.travis.yml b/.travis.yml
index a7b70d56fa9b..e93b11ca9d61 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,8 +25,8 @@ cache:
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
 
-# Update Gradle Wrapper instead of letting Travis execute './gradlew assemble' by default
-install: ./gradlew wrapper --gradle-distribution-url=https://services.gradle.org/distributions-snapshots/gradle-3.0-20160702000020+0000-bin.zip
+# Display Gradle version instead of letting Travis execute './gradlew assemble' by default
+install: ./gradlew -version
 
 script:
   - java -version
diff --git a/build.gradle b/build.gradle
index 56182f76fe7b..6e7b7198286c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -499,13 +499,8 @@ configure(rootProject) {
 	prepareGhPages.dependsOn(createCurrentDocsFolder)
 
 	task wrapper(type: Wrapper) {
-		// To build against Gradle 3.0 nightly builds, obtain the latest
-		// distribution URL (http://gradle.org/gradle-nightly-build/)
-		// and then execute the following from the command line, using
-		// the latest distribution URL:
-		// gradlew wrapper --gradle-distribution-url=https://services.gradle.org/distributions-snapshots/gradle-3.0-20160615000025+0000-bin.zip && gradlew -version && gradlew clean test
-
-		distributionUrl = 'https://services.gradle.org/distributions/gradle-2.14.1-bin.zip'
+		description = 'Generates gradlew and gradlew.bat scripts'
+		gradleVersion = '3.0'
 	}
 
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 3baa851b28c6..deedc7fa5e63 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 18f889b92b98..d236bfb52c09 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jul 18 12:10:57 CEST 2016
+#Mon Aug 15 20:48:41 CEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip
diff --git a/gradlew b/gradlew
index 27309d92314c..9aa616c273d8 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 832fdb6079b4..f9553162f122 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