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