Signed-off-by: Victor Vieux <victorvieux@gmail.com> (cherry picked from commit c57fdb2a14cfba584686ddad909e3006284d10aa) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit b4d36e47c3501541dc66b6336e286b8c11cbcec7) Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>