Allow empty headers.
revert, incorrect
Merge branch 'master' into portable
 Allow empty headers.
Merge branch 'master' into portable