A+C: Matt Reiferson (individual CLA)

Generated by addca.

R=gobot
CC=golang-dev
https://codereview.appspot.com/14375043