luci-0.10: merge r7270 - r7290