Merge pull request #2389 from dibdot/adblock