Should help windows/amd64. TBR=khr CC=golang-codereviews https://golang.org/cl/134660043
Attach a file by drag & drop or click to upload
