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