Merge pull request #17663 from yanns/patch-1

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-11-24 10:34:43 -08:00
commit 2ddc61e941