Merge pull request #2158 from dibdot/adblock