Comment 1 for bug 327620

I think this is fixed in the attached branch, but I will need to do some additional testing tomorrow morning to ensure that this works on stable, edge and staging

Markus