Merge pull request #5057 from dibdot/adblock