luci-0.10: merge r7813 - r7842