Merge branch 'master' of github.com:assimp/assimp into issue_1470
authorJared Mulconry <jaredmulconry@gmail.com>
Thu, 5 Oct 2017 08:34:37 +0000 (19:34 +1100)
committerJared Mulconry <jaredmulconry@gmail.com>
Thu, 5 Oct 2017 08:34:37 +0000 (19:34 +1100)

Trivial merge