Ported to weekly Go release.
4 files changed