Updates #3254. R=golang-dev, bradfitz, alex.brainman CC=golang-dev https://golang.org/cl/5783058
Attach a file by drag & drop or click to upload
