Ubuntu

Comment 44 for bug 721469

Backported this to 2.13 stable branch.