Merge pull request #1128 from dibdot/app-adblock