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