From 6dcce25719e71831e12e0b36f030c6f5a0b6efb7 Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Tue, 5 Jun 2018 13:24:34 -0400
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into
 release-1.11

Kubernetes-commit: f16c15909adccc7f8fb1423cbf4a7bd2274ff4f6