Merge pull request #4218 from stangri/simple-adblock