Fixes issues 6420. R=ken2 CC=golang-dev https://golang.org/cl/13703044
Attach a file by drag & drop or click to upload
