Here is a new version of the patch with an updated commit message. Thecfbot results [0] look good, so I plan to commit this one shortly unlesssomeone objects.
[0] https://cirrus-ci.com/build/6599760059039744
-- nathan