Merged from HEAD:
- Gustav's patches between revision 1.96 and 1.98 that fixed bug 230696 and some other problems with header encoding.