Merge branch 'iss#5061' of https://github.com/sontags/docker into iss#5061

Signed-off-by: Daniel Menet <membership@sontags.ch>
Merge branch 'iss#5061' of https://github.com/sontags/docker into iss#5061

Signed-off-by: Daniel Menet <membership@sontags.ch>