Merge branch 'net' of https://github.com/brendandburns/kubernetes-1 into net