luci-0.9: merge r5902, r5903