Merge pull request #2161 from dibdot/adblock