Merge pull request #1997 from dibdot/adblock