diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 14d87dac..6efcfdbc 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -392,207 +392,207 @@
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/fields",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/labels",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/selection",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/types",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/json",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/naming",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/net",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/version",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/watch",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-			"Rev": "705cfa51a97f837a6599d463e2e206ad65903b60"
+			"Rev": "d19e3354dd8cc16b92ff36926371c41f30b1025e"
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
diff --git a/tools/remotecommand/remotecommand.go b/tools/remotecommand/remotecommand.go
index 6b69f366..d2b29861 100644
--- a/tools/remotecommand/remotecommand.go
+++ b/tools/remotecommand/remotecommand.go
@@ -30,8 +30,8 @@ import (
 	spdy "k8s.io/client-go/transport/spdy"
 )
 
-// StreamOptions holds information pertaining to the current streaming session: supported stream
-// protocols, input/output streams, if the client is requesting a TTY, and a terminal size queue to
+// StreamOptions holds information pertaining to the current streaming session:
+// input/output streams, if the client is requesting a TTY, and a terminal size queue to
 // support terminal resizing.
 type StreamOptions struct {
 	Stdin             io.Reader