Merge branch 'master' of https://github.com/haproxy/haproxy
Merge branch 'master' of https://github.com/lazy404/haproxy