Merge pull request #2498 from dibdot/adblock