Merge pull request #6922 from dibdot/adblock