rsc's earlier fix, plus tests. R=rsc CC=golang-dev https://golang.org/cl/4285062
Attach a file by drag & drop or click to upload
