Merge pull request #40 from heil/master

haproxy: add upstream bugfix, adapt Copyright
Merge remote-tracking branch 'upstream/master'