Have TrackLoader check typestring instead of path when checking to see if trying to load an index file directly
Merge remote-tracking branch upstream/$:{upbranch}