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