Q83

Q83: Pull security fixes from Mozilla's fork