Merge branch 'master' of github.com:dims/docker-py
Merge branch 'master' of github.com:dims/docker-py