Merge pull request #2344 from dibdot/adblock