Merge pull request #3791 from dibdot/adblock4