Merge branch 'master' into gltf2-materials
authorKim Kulling <kimkulling@users.noreply.github.com>
Tue, 24 Oct 2017 08:40:20 +0000 (10:40 +0200)
committerGitHub <noreply@github.com>
Tue, 24 Oct 2017 08:40:20 +0000 (10:40 +0200)

Trivial merge