Fixes #4586. R=golang-dev, remyoudompheng, r CC=golang-dev https://golang.org/cl/7307082
Attach a file by drag & drop or click to upload