Merge pull request #5159 from dibdot/adblock