Automatic merge from submit-queue Use proper codec in client
Checkout https://github.com/kubernetes/contrib for anything that is missing here!