Signed-off-by: Brian Goff <cpuguy83@gmail.com> (cherry picked from commit 7dff31064824ed1f9b046fe5c29bd707e663ee0b) Signed-off-by: Tibor Vass <tibor@docker.com>