Assimp fixes
Merge branch 'master' into ws1415_4