luci-0.8: merge r3828-r3829