Merge pull request #1523 from dibdot/adblock