I already submitted a patch for that: https://bugzilla.mozilla.org/show_bug.cgi?id=831948

That one and this one really go hand in hand.