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