Since this directly addresses the same code touched by the proposed fix for bug #2039229, I will build the fix atop Jeff's branch from that bug.
Since this directly addresses the same code touched by the proposed fix for bug #2039229, I will build the fix atop Jeff's branch from that bug.