Fixes #1390. R=golang-dev, minux.ma, adg, agl CC=golang-dev https://golang.org/cl/6631044
Attach a file by drag & drop or click to upload
