luci-0.11: merge r9356 - r9360