AS> Can I have a couple of days to send in a revised patch to fix the
AS> above issue as well as some others?
AS> It would be good for 6.x and 7 (haven't tested it against HEAD).
AS> Sorry for being silent about this, I meant to update the incident
AS> myself, just swamped with other stuff right now!!! :D
Whoops! I was just cleaning up my "mess" (open pr), so please go ahead
and do what you've got planned when you're able to, since it's much