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

Trivial merge