Merge from Perforce
Fix some script issues