Merge pull request #1688 from dibdot/adblock