It is based on changeset 4186064 by Raph Levien <raph@google.com>. R=r, nigeltao_gnome CC=golang-dev https://golang.org/cl/4435051
