trunk: Merge fix from luci-0.11

git-svn-id: http://svn.luci.subsignal.org/luci/trunk@9955 ab181a69-ba2e-0410-a84d-ff88ab4c47bc