Fixes #8086. LGTM=bradfitz R=golang-codereviews, bradfitz CC=golang-codereviews https://golang.org/cl/153420044
Attach a file by drag & drop or click to upload