luci-0.9: merge r5908-r5911