Merge pull request #1124 from dibdot/app-adblock