Fixes #1104. R=golang-dev, mattn, r CC=Joe Poirier, golang-dev https://golang.org/cl/3051041
Attach a file by drag & drop or click to upload
