Merge from dotcloud/docker master Upstream-commit: eb06a7b8f87e14891b38f650e13e23760cf7a051 Component: engine