Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Thu, 27 Jul 2017 18:49:54 +0000 (20:49 +0200)
committerKim Kulling <kim.kulling@googlemail.com>
Thu, 27 Jul 2017 18:49:54 +0000 (20:49 +0200)

Trivial merge