Fixes #2440. R=r, dsymonds CC=golang-dev https://golang.org/cl/5559043
Attach a file by drag & drop or click to upload
