Signed-off-by: Andrew Hsu <andrewhsu@docker.com> Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 75c4b741550a3c5cb061269cc92a5d563d153626) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 5cd4797c89383159219716de92775138c2dd17c5 Component: engine