• Merge branch 'master' into firefox-merge-v12

    mahmoud-adam85 committed Aug 7, 2018