luci-0.11: merge r9571 - r9622