Fixes #2637. R=golang-dev, mikioh.mikioh, iant CC=golang-dev https://golang.org/cl/5508043
Attach a file by drag & drop or click to upload
