Merge mozilla-inbound to mozilla-central. a=merge

commita80651653faa78fa4dfbd238d099c2aad1cec304
parent7954f12743635c27f4fa7c4382ae777e6339bca5
parenta5d54ec253aa42677efcaff23a127aba4163b8ea
hg9302fd8c95c05e5a5cd295dde3bbdac2d58d6256
gita80651653faa78fa4dfbd238d099c2aad1cec304
authorAndreea Pavel <apavel@mozilla.com>
committerAndreea Pavel <apavel@mozilla.com>
commit timeTue, 10 Jul 2018 19:33:22 +0300