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