Merging latest from Torque3D master into glepag1 Fork