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