Merge pull request #1020 from danrl/luci-app-squid