Code fix by Alex Bramley. Fixes #4064. R=golang-dev, adg CC=golang-dev https://golang.org/cl/7289049
Attach a file by drag & drop or click to upload
