Here is what I have staged for commit, which I'm planning to do tomorrow.Please review and/or test if you are able.
-- nathan