Merge pull request #116 from jschlyter/haproxy_direct