Merged to new haproxy version.