Fixes #5619. R=golang-dev, r, peter.armitage, go.peter.90 CC=golang-dev https://golang.org/cl/9952044
Attach a file by drag & drop or click to upload
