Merge pull request #2580 from dibdot/adblock