luci-0.8: merge r3809-r3822