Merge pull request #2304 from dibdot/adblock