Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Fri, 29 Sep 2017 19:59:11 +0000 (21:59 +0200)
committerKim Kulling <kim.kulling@googlemail.com>
Fri, 29 Sep 2017 19:59:11 +0000 (21:59 +0200)

Trivial merge