A+C: Dominik Honnef (individual CLA)

Generated by addca (mostly, until codereview
blew up)

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