Comment 1 for bug 518724

Setting importance to high as this actually has a patch :)
Could you file a merge proposal for it?

The code looks good to me, in an ideal world we'd have tests for this, but I think the testsuite is currently broken due to some issue with imports.