• Resolve conflicts after merging with firefox v11.x

    @mahmoud-adam85
    mahmoud-adam85 committed May 15, 2018
    bff808f