Signed-off-by: Charles Smith <charles.smith@docker.com> (cherry picked from commit f98f596c19cb589569ec89bd12d562d8ddd03843) Signed-off-by: Tibor Vass <tibor@docker.com>