luci-0.8: merge r4521-r4525