Merge pull request #1 from assimp/master
authorRichard Mitton <rmitton@users.noreply.github.com>
Fri, 15 Sep 2017 18:57:49 +0000 (11:57 -0700)
committerGitHub <noreply@github.com>
Fri, 15 Sep 2017 18:57:49 +0000 (11:57 -0700)
Merged from master


Trivial merge