Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@goolemail.com>
Mon, 8 May 2017 19:29:07 +0000 (21:29 +0200)
committerKim Kulling <kim.kulling@goolemail.com>
Mon, 8 May 2017 19:29:07 +0000 (21:29 +0200)

Trivial merge