Fixes #8067 LGTM=r R=r CC=golang-codereviews https://golang.org/cl/146480043
Attach a file by drag & drop or click to upload
