Merge branch 'master' into kill_issue
Merge branch 'kill_issue' of github.com:creack/docker into kill_issue