• Cherry pick patch from https://bugzilla.mozilla.org/show_bug.cgi?id=1… 

    …369536
    @fitzgen
    fitzgen committed Jun 1, 2017
    c237b35