Merge pull request #20717 from rutsky/patch-1

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-02-08 02:02:34 -08:00
commit fe8b872779