Merge pull request #4545 from dibdot/adblock