Merge pull request #1502 from dibdot/adblock