luci-0.8: merge r4599 and r4600