Merge pull request #4465 from dibdot/adblock