Merge branch 'master' into delete-options

Author: grantr

hack/verify.sh

@@ -39,7 +39,6 @@ gometalinter.v2 --disable-all \
     --enable=errcheck \
     --enable=varcheck \
     --enable=goconst \
-    --enable=gosec \
     --enable=unparam \
     --enable=ineffassign \
     --enable=nakedret \
@@ -53,5 +52,6 @@ gometalinter.v2 --disable-all \
     --skip=atomic \
     ./pkg/...
 # TODO: Enable these as we fix them to make them pass
+#    --enable=gosec \
 #    --enable=maligned \
 #    --enable=safesql \