A+C: Richard Musiol (individual CLA)

Generated by addca.

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