Hi,
Hello, looks like upstream has a working simple patch that might be cherry-picked
I've seen that go past on the mailing list; I was going to give it a day or two and see if upstream actually commit that patch (I've not seen Phil comment on it yet).
Regards, Matthew