Fixes #1647. R=adg, rsc1, r2, rsc, r CC=golang-dev https://golang.org/cl/4444083
Attach a file by drag & drop or click to upload
