luci-0.10: merge trunk