Merge inbound to mozilla-central. a=merge

commit40577076a6e7a14d143725d0288353c250ea2b16
parentd0e5083a98aa106c29ab5ac2233f645bd90e77d8
parent3e0b344a6afba7dae992772a960b870a053f1ae1
hg0344af5522398276a98629b66df90cca6f395245
git40577076a6e7a14d143725d0288353c250ea2b16
authorCosmin Sabou <csabou@mozilla.com>
committerCosmin Sabou <csabou@mozilla.com>
commit timeWed, 13 Jun 2018 12:22:15 +0300