Merge pull request #1359 from dibdot/adblock