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