Merge tag 'v1.4.0-rc3' into master

glide.yaml

@@ -80,9 +80,6 @@ import:
   vcs: git
 - package: github.com/abbot/go-http-auth
 - package: github.com/NYTimes/gziphandler
-  version: ^v1002.0.0
-  repo: https://github.com/containous/gziphandler.git
-  vcs: git
 - package: github.com/docker/leadership
 - package: github.com/satori/go.uuid
   version: ^1.1.0
@@ -209,7 +206,9 @@ testImport:
 - package: github.com/docker/libcompose
   version: 1b708aac26a4fc6f9bff31728a8e3a252ef57dbd
 - package: github.com/go-check/check
-  version: 11d3bc7aa68e238947792f30573146a3231fc0f1
+  version: fork-containous
+  repo: https://github.com/containous/check.git
+  vcs: git
 - package: github.com/libkermit/compose
   version: 4a33a16f1446ba205c4da7b09105d5bdc293b432
   subpackages: