Merge inbound to mozilla-central. a=merge
commitbffd3e0225b65943364be721881470590b9377c1
authorMargareta Eliza Balazs <ebalazs@mozilla.com>
Mon, 5 Mar 2018 09:41:34 +0000 (5 11:41 +0200)
committerMargareta Eliza Balazs <ebalazs@mozilla.com>
Mon, 5 Mar 2018 09:41:34 +0000 (5 11:41 +0200)
tree1dde5fd59b74b92c1b8a18f5e9a9c61bfdf41252
parent90c41237b2fe5b49b5aa2660e363109bde5ebe6f
parent7c3654951629a7671412cc24aefb496d3ecadff8
Merge inbound to mozilla-central.  a=merge