Merge pull request #2555 from castillofrancodamian/adblock