C: add Michael Matloob (Google CLA)
C: add Michael Matloob (Google CLA)

R=golang-dev, bradfitz
CC=golang-dev
https://codereview.appspot.com/7343043
abustany/go,abustany/go,abustany/go,abustany/go,abustany/go,abustany/go,abustany/go