Merge branch 'master' of https://github.com/dotcloud/docker-registry into docker-master
Updatream update