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