luci-0.10: merge r6825-r6830