Merge pull request #2573 from castillofrancodamian/simple-adblock