Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@goolemail.com>
Wed, 29 Mar 2017 18:56:55 +0000 (20:56 +0200)
committerKim Kulling <kim.kulling@goolemail.com>
Wed, 29 Mar 2017 18:56:55 +0000 (20:56 +0200)

Trivial merge