Fixes #4184. R=golang-dev, bradfitz, minux.ma, cookieo9 CC=golang-dev https://golang.org/cl/7251044
Attach a file by drag & drop or click to upload
