Fixes #1936. Fixes #1940. R=rsc, r, iant, ken, iant CC=golang-dev https://golang.org/cl/4585049
Attach a file by drag & drop or click to upload
