Merge pull request #1277 from dibdot/adblock