Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Sat, 17 Jun 2017 19:17:39 +0000 (21:17 +0200)
committerKim Kulling <kim.kulling@googlemail.com>
Sat, 17 Jun 2017 19:17:39 +0000 (21:17 +0200)

Trivial merge