• Update for upstream changes

    @sfackler
    sfackler committed Jul 10, 2014
    e9644d4