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