Merge pull request #2400 from dibdot/adblock