luci-0.9: merge r5920-5922