This change copies the respective changes from https://golang.org/cl/20605.
There is a format conflict here - we are going to track tip, not 1.6.
This change should fix the issue when testing against tip.
Fixesgolang/go#14824.
Change-Id: I58e79cc65748e7a3e5c8486c6cee339884110a07
Reviewed-on: https://go-review.googlesource.com/20693
Reviewed-by: Alan Donovan <adonovan@google.com>
+ test
Change-Id: I8db03e19ebb4cf3888f259457aaa3c931da23f24
Reviewed-on: https://go-review.googlesource.com/20109
Reviewed-by: Robert Griesemer <gri@golang.org>