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