A+C: John Olds (individual CLA)

Generated by a+c.

LGTM=jtolds, jbd
R=gobot, jbd, jtolds
CC=golang-codereviews
https://codereview.appspot.com/137300043