From 23a6acdcbc66f64375c4b11180061c0e265e4a34 Mon Sep 17 00:00:00 2001
From: Marco Castelluccio <mcastelluccio@mozilla.com>
Date: Wed, 2 Oct 2019 00:22:54 +0000
Subject: [PATCH] merge mozilla-inbound to mozilla-central. r=merge a=merge

MozReview-Commit-ID: ExAoHf5iXNn

UltraBlame original commit: ae39864562c6048fdc2950c5dfedb48e247c3300