FIX: use localhost if DOCKER_HOST not defined
Merge branch 'pmarques-docker_host' into develop