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