luci-0.8: merge r4532