Fixes #1258. R=gri, msolo, bradfitzpatrick, r2 CC=golang-dev https://golang.org/cl/2988041
Attach a file by drag & drop or click to upload
