HOTFIX: texture importing was failing for TriMesh
Merge remote-tracking branch 'upstream/master' into correspond