luci-0.9: merge r5193-r5194