If there's a merge conflict against master, then it'd be good for an updated patch to be posted.
Thanks! Stephen
Attached is an updated patch that should directly apply against current master.
--
Simon Muller
<text_header_v6.patch>
This patch looks good. I realized I should have changed the status back while we were discussing all this. It is now (and still is) ready for committer.