Merge branch 'master' of https://github.com/assimp/assimp
authorrickomax <rickomax@hotmail.com>
Sat, 15 Jul 2017 14:22:14 +0000 (11:22 -0300)
committerrickomax <rickomax@hotmail.com>
Sat, 15 Jul 2017 14:22:14 +0000 (11:22 -0300)

Trivial merge