Also fix the errors it catches. Fixes #1654. R=rsc CC=golang-dev https://golang.org/cl/5489060
Attach a file by drag & drop or click to upload
