luci-0.10: merge r6759-r6784