Merge pull request #1108 from dibdot/app-adblock