Merge pull request #4835 from dibdot/adblock