Merge pull request #1426 from dibdot/app-adblock