Merge pull request #10142 from stangri/master-simple-adblock