Merge pull request #2399 from dibdot/adblock