Merge bug fix from dotcloud/docker master Upstream-commit: 0c38f86e5e799e71866a3ee2f876c170e71c68d0 Component: engine