Created attachment 345176 backport to CVS HEAD
Passes my tests. Waiting on the tryserver; will update when that's done.
Created attachment 345176
backport to CVS HEAD
Passes my tests. Waiting on the tryserver; will update when that's done.