Fixes #6406. R=golang-codereviews, bradfitz CC=golang-codereviews https://golang.org/cl/46900043
Attach a file by drag & drop or click to upload
