Merge "Fix issue #6595555: deal better with fragmentless headers."