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