luci-0.8: merge r4776-r4777