Merge pull request #1490 from dibdot/adblock