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