Merge remote-tracking branch 'khronos-gltf/master' into khronos-gltf-master

Conflicts:
	converter/COLLADA2GLTF/CMakeLists.txt