Fixes #3424. R=fullung, adg CC=golang-dev https://golang.org/cl/6343088
Attach a file by drag & drop or click to upload
