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