trunk: Merge fix from luci-0.11