Fixes #2171 This is the real change. R=adg CC=golang-dev, r, rsc https://golang.org/cl/4943041
Attach a file by drag & drop or click to upload
