Fixes #6849. Fixes #6867. R=golang-dev, agl CC=golang-dev https://golang.org/cl/35870043
Attach a file by drag & drop or click to upload