Merge pull request #1780 from dibdot/adblock