Use more compatible URI#host
Merge branch 'master' into travis