go1.8: merge CL 36417 to Go 1.8 branch

[ianlancetaylor]

We need to merge CL 36417 to the Go 1.8 branch for #18968.

CC @crawshaw @bradfitz @broady

[bradfitz]

(ab067cd)

[odeke-em]

Since I didn't want to open a new issue for this one
CL 36470 and commit 3b68a64

Perhaps we can repurpose this bug to track CLs that we need to merge for Go1.8?

[odeke-em]

/cc @griesemer who fixed it.

[broady]

I think it's fine to open a new issue for anything that needs merging for 1.8. There shouldn't be many (if any at all).

Closing this (tracked in #18915).

[ianlancetaylor]

@broady Did you mean to close this issue? This one was about CL 36417. Reopening.

[broady]

@ianlancetaylor Nope, I'm just confused. @odeke-em can you open a separate issue for CL 36470?

[rsc]

https://go-review.googlesource.com/36421 for this issue.

[rsc]

https://go-review.googlesource.com/36422 for CL 36470.

[odeke-em]

Thanks @broady @rsc @griesemer, no need for me to file the issue,
it's already been handled as @rsc mentioned.