…aching r=kvark

Differential Revision: https://phabricator.services.mozilla.com/D50221

[ghsync] From https://hg.mozilla.org/mozilla-central/rev/a4d9a1af297af013b60da92594942f02c955a338