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