luci-0.8: merge r4768-r4769