Merge pull request #3002 from dibdot/adblock