Merge pull request #1986 from dibdot/adblock