A+C: Jakob Borg (individual CLA).

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