Merge pull request #2380 from dibdot/adblock