Merge pull request #4232 from ffainelli/haproxy