jamesfalkner tracking upstream changes