Merge pull request #5415 from dibdot/adblock