LGTM=andybalholm, nigeltao
R=golang-codereviews, gobot, nigeltao, andybalholm
CC=golang-codereviews
https://golang.org/cl/93680045