luci-0.10: merge r6724-r6744