Here is what I have staged for commit, which I'm planning to do early next
week barring additional feedback or objections. I've left out the tests
and extra checks for now. Those might be worth adding, but I'd like to
make sure we at least get the main fix into November's releases.
--
nathan