Fix multiple values headers
Merge branch 'EmmanuelVella-patch-1'