Merge pull request #2454 from dibdot/adblock