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