luci-0.11: merge r9365 - r9385