Merge pull request #1235 from aa65535/luci-base