luci-0.9: merge r4886-r4890