Fixes #2950. Fixes #2951. R=golang-dev, r CC=golang-dev, remy https://golang.org/cl/5672044
Attach a file by drag & drop or click to upload
