Merge pull request #3901 from dibdot/adblock