Fixes #6338 R=golang-dev, kin.wilson.za, rsc CC=golang-dev https://golang.org/cl/36180044
Attach a file by drag & drop or click to upload
