Merge pull request #4367 from dibdot/adblock