Merge pull request #1007 from maturnbull/proxy_per_host