Merge pull request #2125 from dibdot/adblock