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