luci-0.10: merge r7897