Brings in this pull request: - https://github.com/docker/libnetwork/pull/1808 Signed-off-by: Tibor Vass <tibor@docker.com>