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