luci-0.11: merge r9628 - r9631