Fixes #6063 R=golang-dev, r, dave CC=dvyukov, golang-dev https://golang.org/cl/12586043
Attach a file by drag & drop or click to upload
