Merge pull request #730 from kuoruan/luci-master