Commits 84a2cbd and c720b55 from gorhill/uBlock/

Since it's not ready yet and I think those commits wouldn't break anything, it should be merged to keep this fork up to date.