Merge pull request #1684 from dibdot/adblock