Fixes #2724. R=r, dsymonds CC=golang-dev https://golang.org/cl/5555043
Attach a file by drag & drop or click to upload
