Fixes #2768. R=golang-dev, lvd, iant CC=golang-dev, remy https://golang.org/cl/5572081
Attach a file by drag & drop or click to upload
