Merge inbound to mozilla-central. a=merge

commit088938b1495aeac586bff94234c9382a4b8ca6da
parente469d8b05b109e50aeb2f2c701080186f2fd893e
parent5386e9c84f64c94c0424d1a6caf29dc318862f2e
hg61e553ff703e2d93db2f03aa901d1976e8084723
git088938b1495aeac586bff94234c9382a4b8ca6da
authorNarcis Beleuzu <nbeleuzu@mozilla.com>
committerNarcis Beleuzu <nbeleuzu@mozilla.com>
commit timeFri, 10 Aug 2018 19:00:28 +0300