Merge pull request #6033 from dibdot/adblock