Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Sat, 22 Oct 2016 20:15:00 +0000 (22:15 +0200)
committerKim Kulling <kim.kulling@googlemail.com>
Sat, 22 Oct 2016 20:15:00 +0000 (22:15 +0200)

Trivial merge