Merge pull request #4516 from dibdot/adblock