A+C: Cristian Staretu (individual CLA) Generated by a+c. R=gobot CC=golang-codereviews https://golang.org/cl/107450043