Merge branch 'master' into wtf
Merge branch 'wtf' into gltf-wtf