Merge pull request #1867 from dibdot/adblock