Comment 13 for bug 880881

Thanks Charles&Matthew. That's somewhat a non trivial change and border line a feature (though a bugfix in spirit I think), doing a ffe from the bug just to get some review from the release team before landing that