Merge pull request #4517 from dibdot/adblock