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