Merge pull request #1614 from dibdot/adblock