Merging bug #760795 into this one. Someone with bug supervising privileges, please assign this to ~osomon.
Merging bug #760795 into this one. Someone with bug supervising privileges, please assign this to ~osomon.