Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com> (cherry picked from commit a31633c2707c78c2ffd684a5a3e576f310af0fb5)