luci-0.11: merge r9353 and r9354