Merge inbound to mozilla-central. a=merge

commitadec563403271e78d1a057259b3e17fe557dfd91
parentef8f9622b4b9933853f8e3e0b46b490891e13ee7
parenta2850b812e0dbc0ab4093329cdaaf39e21f8bd30
hgf7895b06b74299a13bba51e3de50c8eaa9729e10
gitadec563403271e78d1a057259b3e17fe557dfd91
authorCsoregi Natalia <ncsoregi@mozilla.com>
committerCsoregi Natalia <ncsoregi@mozilla.com>
commit timeThu, 6 Dec 2018 11:25:51 +0200