Merge branch 'development' into maps_versioning_fix

Conflicts:
	Sources/Internal/Scene3D/SceneFileV2.cpp