Merge branch 'rivera' of https://github.com/fabric-engine/SpliceSoftimage into softimage_properties
Merge branch 'softimage_properties' of https://github.com/ahmidou/SpliceSoftimage into softimage_properties