luci-0.9: merge r4957-r4959