Merge pull request #1115 from dibdot/app-adblock