Merge branch 'haproxy-1.2.12'