do not choke on malformed headers ...
Merge branch 'master' into portable