diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index 07c739d569..79a66abbd4 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -490,7 +490,14 @@ namespace OpenSim.Framework
                     m_wearables[i] = new AvatarWearable();
             }
             m_wearables[wearableId].Clear();
+<<<<<<< HEAD
             for (int i = 0; i < wearable.Count; i++)
+=======
+            int count = wearable.Count;
+            if (count > AvatarWearable.MAX_WEARABLES)
+                count = AvatarWearable.MAX_WEARABLES;
+            for (int i = 0; i < count; i++)
+>>>>>>> master
                 m_wearables[wearableId].Add(wearable[i].ItemID, wearable[i].AssetID);
         }
 
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 1481fca653..f1d6f84f57 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -167,13 +167,13 @@
     InworldRestartShutsDown = false
 
     ; Use of normalized 55FPS statistics
-	; Opensim does not have a frame rate control like other simulators
-	; Most parameters that control timing can be configurable region by region
-	; To achive closer compatibility with values expected by viewers, scripts and users
+	; Opensim does not have a frame rate control like other simulators.
+	; Most parameters that control timing can be configurable region by region.
+	; To achieve closer compatibility with values expected by viewers, scripts and users
 	; some parameters are converted to a equivalent per frame value.
-	; Adicionaly they are scaled to values they whould have on a system running at a nominal 55 frames per second rate
+	; Additionally, they are scaled to values they would have on a system running at a nominal 55 frames per second rate.
 	; The scale factor it 55 * FrameTime, corresponding to 5 with default configuration
-	; You can choose to not apply this scale factor setting Normalized55FPS to false.
+	; You can choose to show the true physics FPS to viewers by setting Normalized55FPS to false.
 	; Normalized55FPS = true
 	
     ; Main Frame time