…s. r=gw

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

[wrupdater] From https://hg.mozilla.org/mozilla-central/rev/8d99e173cdf6268c7b69690882f15ab5bed8f6f2