Merge pull request #4056 from dibdot/adblock