Bring fork up to date with upstream