-
Cherry-pick commit f1322ac from the 1.5.x branch Signed-off-by: Euan Harris <euan.harris@docker.com> (cherry picked from commit 8d429487)
1e341375
Cherry-pick commit f1322ac from the 1.5.x branch Signed-off-by: Euan Harris <euan.harris@docker.com> (cherry picked from commit 8d429487)