luci-0.10: merge r6976 and r6977