Merge pull request #2983 from dibdot/adblock