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