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