Fixes #1698. Fixes #1699. R=ken2 CC=golang-dev https://golang.org/cl/4419041
Attach a file by drag & drop or click to upload
