luci-0.9: merge r5769