luci-0.9: merge r5861-r5863