Merge pull request #21874 from rutsky/patch-3

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-03-02 02:26:44 -08:00
commit a9594b4470