Fixes #4644. R=r, adonovan CC=golang-dev https://golang.org/cl/7307083
Attach a file by drag & drop or click to upload
