Pulling in the haproxy output fix