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