Fixes #6998. R=golang-codereviews, gobot, r CC=golang-codereviews https://golang.org/cl/44880044
Attach a file by drag & drop or click to upload
