A+C: Kamil Kisiel (individual CLA)

Generated by addca.

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