Firefox merge v11 #35

Merged
merged 5 commits into from May 15, 2018