Merge pull request #4996 from dibdot/adblock-4.1.1