backport fix for docker 1.1.2