Merge branch 'master' of github.com:dockercn/docker-proxy