luci-0.11: merge r9362 and r9363