Merge pull request #2456 from dibdot/adblock