Merge back from Mozilla repo