Merge pull request #4967 from dibdot/adblock