Merging Assimp update