Ubuntu

Comment 13 for bug 417770

Would be great to get some feedback on this patch before we include it in Ubuntu