luci-0.8: Merge r4380-r4381