Fixes #5357 LGTM=nigeltao R=nigeltao CC=golang-codereviews https://golang.org/cl/87910050
Attach a file by drag & drop or click to upload
