luci-0.10: merge r6695 and r6696