Merged with upstream gecko d35342e7bcd0