diff --git a/.travis.yml b/.travis.yml
index 2b5f04ef..117927f1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,14 +20,14 @@ go_import_path: firebase.google.com/go
 
 before_install:
     # Golint requires Go 1.7 or later.
-    - if ! [[ "$TRAVIS_GO_VERSION" =~ ^1\.6\.[0-9]+$ ]]; then go get github.com/golang/lint/golint; fi
+    - if ! [[ "$TRAVIS_GO_VERSION" =~ ^1\.6\.([0-9]+|x)$ ]]; then go get github.com/golang/lint/golint; fi
 
 install:
     # Prior to golang 1.8, this can trigger an error for packages containing only tests.
     - go get -t -v $(go list ./... | grep -v integration)
 
 script:
-    - if ! [[ "$TRAVIS_GO_VERSION" =~ ^1\.6\.[0-9]+$ ]]; then golint -set_exit_status $(go list ./...); fi
+    - if ! [[ "$TRAVIS_GO_VERSION" =~ ^1\.6\.([0-9]+|x)+$ ]]; then golint -set_exit_status $(go list ./...); fi
     - ./.travis.gofmt.sh
     - go test -v -race -test.short ./...        # Run tests with the race detector.
     - go vet -v ./...                           # Run Go static analyzer.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a157e88e..de57820f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Unreleased
 
+# v3.1.0
+
 - [added] Added new functions for testing errors in the `iid` package
   (e.g. `iid.IsNotFound()`).
 - [fixed] `auth.UpdateUser()` and `auth.DeleteUser()` return the expected
diff --git a/firebase.go b/firebase.go
index 3b557dd6..7f8ad756 100644
--- a/firebase.go
+++ b/firebase.go
@@ -42,7 +42,7 @@ import (
 var defaultAuthOverrides = make(map[string]interface{})
 
 // Version of the Firebase Go Admin SDK.
-const Version = "3.0.0"
+const Version = "3.1.0"
 
 // firebaseEnvName is the name of the environment variable with the Config.
 const firebaseEnvName = "FIREBASE_CONFIG"