Merge pull request #1999 from dibdot/adblock