Comment # 22 on bug 81382 from Patrick

Thanks for the patch, but I'm on vacation till 26th September, so long I cannot
test it.

@Daniel
As you've got the same problem, could you test the patches?