luci-0.11: merge r9559 - r9569