Ok, so I've found the patches Chris proposed through OPW but did not bother proposing as a patch here, and included them (with a slight improvement) here.
Please review and apply.
Ok, so I've found the patches Chris proposed through OPW but did not bother proposing as a patch here, and included them (with a slight improvement) here.
Please review and apply.