The patch appears to work -- the nightly tests of the branch are consistently running to completion now. I think we can include this for the 1.3 branch -- and if we do, those nightly tests may actually work, too.