Fixes bug 7145 R=golang-codereviews, iant CC=golang-codereviews https://golang.org/cl/53970043
Attach a file by drag & drop or click to upload
