luci-0.10: merge r7229 and r7230