A+C: added Alexei Sholik (individual CLA)

R=golang-dev, bradfitz
CC=golang-dev
https://codereview.appspot.com/8351043