Integrating github/staging through commit 5f214be

Gems/NvCloth/Code/Source/System/SystemComponent.cpp

@@ -51,7 +51,7 @@ namespace NvCloth
             }
         };
 
-        // Implementation of the error callback interface directing nvcloth library errors to Lumberyard error output.
+        // Implementation of the error callback interface directing nvcloth library errors to Open 3D Engine error output.
         class AzClothErrorCallback
             : public physx::PxErrorCallback
         {
@@ -91,7 +91,7 @@ namespace NvCloth
             physx::PxErrorCode::Enum m_lastError = physx::PxErrorCode::eNO_ERROR;
         };
 
-        // Implementation of the assert handler interface directing nvcloth asserts to Lumberyard assertion system.
+        // Implementation of the assert handler interface directing nvcloth asserts to Open 3D Engine assertion system.
         class AzClothAssertHandler
             : public nv::cloth::PxAssertHandler
         {