Fixes #3815. R=r CC=golang-dev https://golang.org/cl/6352109
Attach a file by drag & drop or click to upload