luci-0.10: merge r7388 - r7450