luci-0.9: backport r6422