Merge pull request #2396 from dibdot/adblock