Fixes golang/go#3880. R=golang-dev, iant CC=golang-dev https://golang.org/cl/6446061
Attach a file by drag & drop or click to upload
