Fixes #1167. R=r, r2 CC=golang-dev https://golang.org/cl/2290044
Attach a file by drag & drop or click to upload
