Update #2573. R=r CC=golang-dev https://golang.org/cl/5656071
Attach a file by drag & drop or click to upload
