Merge with assimp:master