diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 8e55321b..fe6afcf1 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -244,331 +244,331 @@
 		},
 		{
 			"ImportPath": "k8s.io/api/admissionregistration/v1alpha1",
-			"Rev": "8759fda11383a1087cf16b1500ce5804fa9f32e7"
+			"Rev": "847e24b2c0e587a6a097d187ebd72e1ca24de001"
 		},
 		{
 			"ImportPath": "k8s.io/api/admissionregistration/v1beta1",
-			"Rev": "8759fda11383a1087cf16b1500ce5804fa9f32e7"
+			"Rev": "847e24b2c0e587a6a097d187ebd72e1ca24de001"
 		},
 		{
 			"ImportPath": "k8s.io/api/apps/v1",
-			"Rev": "8759fda11383a1087cf16b1500ce5804fa9f32e7"
+			"Rev": "847e24b2c0e587a6a097d187ebd72e1ca24de001"
 		},
 		{
 			"ImportPath": "k8s.io/api/apps/v1beta1",
-			"Rev": "8759fda11383a1087cf16b1500ce5804fa9f32e7"
+			"Rev": "847e24b2c0e587a6a097d187ebd72e1ca24de001"
 		},
 		{
 			"ImportPath": "k8s.io/api/apps/v1beta2",
-			"Rev": "8759fda11383a1087cf16b1500ce5804fa9f32e7"
+			"Rev": "847e24b2c0e587a6a097d187ebd72e1ca24de001"
 		},
 		{
 			"ImportPath": "k8s.io/api/authentication/v1",
-			"Rev": "8759fda11383a1087cf16b1500ce5804fa9f32e7"
+			"Rev": "847e24b2c0e587a6a097d187ebd72e1ca24de001"
 		},
 		{
 			"ImportPath": "k8s.io/api/authentication/v1beta1",
-			"Rev": "8759fda11383a1087cf16b1500ce5804fa9f32e7"
+			"Rev": "847e24b2c0e587a6a097d187ebd72e1ca24de001"
 		},
 		{
 			"ImportPath": "k8s.io/api/authorization/v1",
-			"Rev": "8759fda11383a1087cf16b1500ce5804fa9f32e7"
+			"Rev": "847e24b2c0e587a6a097d187ebd72e1ca24de001"
 		},
 		{
 			"ImportPath": "k8s.io/api/authorization/v1beta1",
-			"Rev": "8759fda11383a1087cf16b1500ce5804fa9f32e7"
+			"Rev": "847e24b2c0e587a6a097d187ebd72e1ca24de001"
 		},
 		{
 			"ImportPath": "k8s.io/api/autoscaling/v1",
-			"Rev": "8759fda11383a1087cf16b1500ce5804fa9f32e7"
+			"Rev": "847e24b2c0e587a6a097d187ebd72e1ca24de001"
 		},
 		{
 			"ImportPath": "k8s.io/api/autoscaling/v2beta1",
-			"Rev": "8759fda11383a1087cf16b1500ce5804fa9f32e7"
+			"Rev": "847e24b2c0e587a6a097d187ebd72e1ca24de001"
 		},
 		{
 			"ImportPath": "k8s.io/api/batch/v1",
-			"Rev": "8759fda11383a1087cf16b1500ce5804fa9f32e7"
+			"Rev": "847e24b2c0e587a6a097d187ebd72e1ca24de001"
 		},
 		{
 			"ImportPath": "k8s.io/api/batch/v1beta1",
-			"Rev": "8759fda11383a1087cf16b1500ce5804fa9f32e7"
+			"Rev": "847e24b2c0e587a6a097d187ebd72e1ca24de001"
 		},
 		{
 			"ImportPath": "k8s.io/api/batch/v2alpha1",
-			"Rev": "8759fda11383a1087cf16b1500ce5804fa9f32e7"
+			"Rev": "847e24b2c0e587a6a097d187ebd72e1ca24de001"
 		},
 		{
 			"ImportPath": "k8s.io/api/certificates/v1beta1",
-			"Rev": "8759fda11383a1087cf16b1500ce5804fa9f32e7"
+			"Rev": "847e24b2c0e587a6a097d187ebd72e1ca24de001"
 		},
 		{
 			"ImportPath": "k8s.io/api/core/v1",
-			"Rev": "8759fda11383a1087cf16b1500ce5804fa9f32e7"
+			"Rev": "847e24b2c0e587a6a097d187ebd72e1ca24de001"
 		},
 		{
 			"ImportPath": "k8s.io/api/events/v1beta1",
-			"Rev": "8759fda11383a1087cf16b1500ce5804fa9f32e7"
+			"Rev": "847e24b2c0e587a6a097d187ebd72e1ca24de001"
 		},
 		{
 			"ImportPath": "k8s.io/api/extensions/v1beta1",
-			"Rev": "8759fda11383a1087cf16b1500ce5804fa9f32e7"
+			"Rev": "847e24b2c0e587a6a097d187ebd72e1ca24de001"
 		},
 		{
 			"ImportPath": "k8s.io/api/imagepolicy/v1alpha1",
-			"Rev": "8759fda11383a1087cf16b1500ce5804fa9f32e7"
+			"Rev": "847e24b2c0e587a6a097d187ebd72e1ca24de001"
 		},
 		{
 			"ImportPath": "k8s.io/api/networking/v1",
-			"Rev": "8759fda11383a1087cf16b1500ce5804fa9f32e7"
+			"Rev": "847e24b2c0e587a6a097d187ebd72e1ca24de001"
 		},
 		{
 			"ImportPath": "k8s.io/api/policy/v1beta1",
-			"Rev": "8759fda11383a1087cf16b1500ce5804fa9f32e7"
+			"Rev": "847e24b2c0e587a6a097d187ebd72e1ca24de001"
 		},
 		{
 			"ImportPath": "k8s.io/api/rbac/v1",
-			"Rev": "8759fda11383a1087cf16b1500ce5804fa9f32e7"
+			"Rev": "847e24b2c0e587a6a097d187ebd72e1ca24de001"
 		},
 		{
 			"ImportPath": "k8s.io/api/rbac/v1alpha1",
-			"Rev": "8759fda11383a1087cf16b1500ce5804fa9f32e7"
+			"Rev": "847e24b2c0e587a6a097d187ebd72e1ca24de001"
 		},
 		{
 			"ImportPath": "k8s.io/api/rbac/v1beta1",
-			"Rev": "8759fda11383a1087cf16b1500ce5804fa9f32e7"
+			"Rev": "847e24b2c0e587a6a097d187ebd72e1ca24de001"
 		},
 		{
 			"ImportPath": "k8s.io/api/scheduling/v1alpha1",
-			"Rev": "8759fda11383a1087cf16b1500ce5804fa9f32e7"
+			"Rev": "847e24b2c0e587a6a097d187ebd72e1ca24de001"
 		},
 		{
 			"ImportPath": "k8s.io/api/settings/v1alpha1",
-			"Rev": "8759fda11383a1087cf16b1500ce5804fa9f32e7"
+			"Rev": "847e24b2c0e587a6a097d187ebd72e1ca24de001"
 		},
 		{
 			"ImportPath": "k8s.io/api/storage/v1",
-			"Rev": "8759fda11383a1087cf16b1500ce5804fa9f32e7"
+			"Rev": "847e24b2c0e587a6a097d187ebd72e1ca24de001"
 		},
 		{
 			"ImportPath": "k8s.io/api/storage/v1alpha1",
-			"Rev": "8759fda11383a1087cf16b1500ce5804fa9f32e7"
+			"Rev": "847e24b2c0e587a6a097d187ebd72e1ca24de001"
 		},
 		{
 			"ImportPath": "k8s.io/api/storage/v1beta1",
-			"Rev": "8759fda11383a1087cf16b1500ce5804fa9f32e7"
+			"Rev": "847e24b2c0e587a6a097d187ebd72e1ca24de001"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/fields",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/labels",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/selection",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/types",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/json",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/net",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/version",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/watch",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-			"Rev": "cd2cae2b39fa57e8063fa1f5f13cfe9862db3d41"
+			"Rev": "5d4f0da8e5fde7cbadf8ab3ce5cfb76f86dd854e"
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
diff --git a/rest/request_test.go b/rest/request_test.go
index fac69025..f75ee86c 100755
--- a/rest/request_test.go
+++ b/rest/request_test.go
@@ -1522,7 +1522,7 @@ func TestBody(t *testing.T) {
 	f.Close()
 	defer os.Remove(f.Name())
 
-	var nilObject *v1.DeleteOptions
+	var nilObject *metav1.DeleteOptions
 	typedObject := interface{}(nilObject)
 	c := testRESTClient(t, nil)
 	tests := []struct {