luci-0.9: merge r6024, r6025