Merge mozilla-central to inbound. a=merge CLOSED TREE
commit3803454d1058b57e7bfe472eafe3940e14fdbbbe
authorMargareta Eliza Balazs <ebalazs@mozilla.com>
Sun, 25 Feb 2018 21:44:52 +0000 (25 23:44 +0200)
committerMargareta Eliza Balazs <ebalazs@mozilla.com>
Sun, 25 Feb 2018 21:44:52 +0000 (25 23:44 +0200)
tree2144eb8f8993670608bb0ccaf1fe1213ae6f2cd2
parent134c4753f613a7ef038390d496136fcc9d2c7fbf
parent047a5b15ab3fb947b2fc8f016b37bf4ba0db329f
Merge mozilla-central to inbound.  a=merge CLOSED TREE