Merge branch 'master' into match-backwards

.travis.yml

@@ -2,7 +2,6 @@ language: go
 
 env:
   - GO111MODULE=off
-  - GO111MODULE=on
 
 go:
   - 1.9.x

cmd/lz4c/compress.go

@@ -7,7 +7,7 @@ import (
 	"os"
 
 	"code.cloudfoundry.org/bytefmt"
-	"github.com/schollz/progressbar/v2"
+	"github.com/schollz/progressbar"
 
 	"github.com/pierrec/cmdflag"
 	"github.com/pierrec/lz4"

cmd/lz4c/uncompress.go

@@ -7,7 +7,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/schollz/progressbar/v2"
+	"github.com/schollz/progressbar"
 
 	"github.com/pierrec/cmdflag"
 	"github.com/pierrec/lz4"