Merge pull request #1801 from dibdot/adblock