…g r=kvark

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

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