Merge pull request #2006 from dibdot/adblock