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