I have committed this patch, after a good deal of review and testing,
including on Windows.
While I did some editorializing, there is more work to do, particularly
on improving comments and messages, but I wanted to get this in as time
is getting very short, and it's important that we not miss this for 9.3.
(Now back to Json ...)
cheers
andrew