LGTM=nigeltao R=nigeltao CC=adg, bryanturley, davidday, golang-codereviews https://golang.org/cl/139440043