backport r8132 to luci-0.10 branch