Imported upstream version '1.0.55' of 'upstream'
Rebase from 'upstream' (no changes)
Trimmed the branch to only the 3rdparty/assimp_devel sub directory
Revert "Trimmed the branch to only the 3rdparty/assimp_devel sub directory"

This reverts commit f543cd68a43e8f9c1a01fa691ae6740f76548fb8.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the 3rdparty/assimp_devel sub directory