luci-0.10: merge r7308 - r7326