Fixes #6610. R=golang-dev, khr CC=golang-dev https://golang.org/cl/14793043
Attach a file by drag & drop or click to upload