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