Fixes #1285. R=r, rsc, iant, ken2, r2 CC=golang-dev https://golang.org/cl/3918041
Attach a file by drag & drop or click to upload
