luci-0.10: merge r7048-r7057