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