Merge pull request #2446 from sotux/master-luci-base