Signed-off-by: Daniel Nephin <dnephin@docker.com> (cherry picked from commit 00d409f03ed825f623b6ef8ec5a3a91cd26194c2) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>