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