Fixes #2280. R=golang-dev, r, bradfitz, iant, andybalholm, gri CC=golang-dev https://golang.org/cl/7816045
Attach a file by drag & drop or click to upload
