luci-0.10: merge r6808 and r6809