luci-0.9: merge 5565#