Add docker host
Merge branch 'master' into github_master