A+C: Casey Marshall (individual CLA) R=golang-dev, bradfitz CC=golang-dev https://golang.org/cl/6948050