luci-0.8: Merge r4461