Fix docker hanging for docker-engine 1.12.4

This MR is here to fix support for Docker 1.12.4.

Fixes #1962

See merge request !415