Merge pull request #4199 from dibdot/adblock