Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit f49dc528ed29e6285c24ef356652cc8bc637c8c7) Signed-off-by: Tibor Vass <tibor@docker.com>