Fixes issue #1897. R=r, gustavo, r CC=golang-dev https://golang.org/cl/4561049
Attach a file by drag & drop or click to upload
