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