Merge branch 'master' of home:/data/git/public/haproxy-1.3