Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@goolemail.com>
Sat, 10 Jun 2017 09:19:25 +0000 (11:19 +0200)
committerKim Kulling <kim.kulling@goolemail.com>
Sat, 10 Jun 2017 09:19:25 +0000 (11:19 +0200)

Trivial merge