luci-0.8: merge r4605 and r4606