Merge with latest master of dotcloud/docker

That is all...