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