Merge branch 'master' into master

.travis.yml

@@ -1,8 +1,9 @@
 language: go
 
 go:
-  - 1.7.x
   - 1.8.x
+  - 1.9.x
+  - tip
 
 script:
   - go vet ./...