tweaks & tests of last bug fix too. R=ken2 CC=golang-dev https://golang.org/cl/1207044
Attach a file by drag & drop or click to upload
