Ensure clients use specified host:port
Merge branch 'master' of github.com:simonswain/straw