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

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