Fixes #7104. LGTM=iant R=golang-dev, iant CC=golang-codereviews https://golang.org/cl/61480049
Attach a file by drag & drop or click to upload
