Merge pull request #2874 from dibdot/adblock