Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/EventManager.cs

OpenSim/Region/Framework/Interfaces/IEstateModule.cs

@@ -46,6 +46,10 @@ namespace OpenSim.Region.Framework.Interfaces
         /// </summary>
         void sendRegionHandshakeToAll();
         void TriggerEstateInfoChange();
+
+        /// <summary>
+        /// Fires the OnRegionInfoChange event.
+        /// </summary>
         void TriggerRegionInfoChange();
 
         void setEstateTerrainBaseTexture(int level, UUID texture);