same as https://golang.org/cl/152088 in more files. Fixes #83. R=r, r1 https://golang.org/cl/152091
Attach a file by drag & drop or click to upload
