Merge pull request #1983 from dibdot/adblock