Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Tue, 18 Jul 2017 15:03:45 +0000 (17:03 +0200)
committerKim Kulling <kim.kulling@googlemail.com>
Tue, 18 Jul 2017 15:03:45 +0000 (17:03 +0200)

Trivial merge