Signed-off-by: Daniel Nephin <dnephin@docker.com> (cherry picked from commit fcde27e6db9ccdb952a1259788404fc500995f98) Signed-off-by: Tibor Vass <tibor@docker.com>