Merge pull request #1157 from dibdot/app-adblock