Merge pull request #3169 from stangri/master-luci-app-simple-adblock