Updates #2362. R=nigeltao CC=golang-dev https://golang.org/cl/6326057
Attach a file by drag & drop or click to upload
