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