Ubuntu

Comment 11 for bug 40473

If we really want to be righteous, there was two separate bug reports from the start. But the bug fixes are trivial enough - and it would be easy to open another bug report in case somebody consider the fixes required would need it.