Fixes #8510. LGTM=rsc R=rsc CC=golang-codereviews https://golang.org/cl/129720043
Attach a file by drag & drop or click to upload
