Merge pull request #1623 from dibdot/adblock