Merge remote-tracking branch 'origin/master' into branch

# Conflicts:
#	Moose Development/Moose/AI/AI_Air.lua
#	Moose Development/Moose/AI/AI_Air_Engage.lua
#	Moose Development/Moose/AI/AI_Air_Patrol.lua
#	Moose Development/Moose/AI/AI_BAI.lua
#	Moose Development/Moose/AI/AI_Balancer.lua
#	Moose Development/Moose/AI/AI_CAP.lua
#	Moose Development/Moose/AI/AI_CAS.lua
#	Moose Development/Moose/AI/AI_Cargo_Airplane.lua
#	Moose Development/Moose/AI/AI_Cargo_Helicopter.lua
#	Moose Development/Moose/AI/AI_Formation.lua
#	Moose Development/Moose/AI/AI_Patrol.lua
#	Moose Development/Moose/Cargo/Cargo.lua
#	Moose Development/Moose/Cargo/CargoCrate.lua
#	Moose Development/Moose/Cargo/CargoGroup.lua
#	Moose Development/Moose/Cargo/CargoUnit.lua
#	Moose Development/Moose/Core/Point.lua

Moose Development/Moose/Core/Point.lua

@@ -1168,6 +1168,9 @@ do -- COORDINATE
   -- @param #COORDINATE self
   -- @return #number The y coordinate.
   function COORDINATE:GetY()
+    if self:IsInstanceOf("POINT_VEC2") then
+      return self.z
+    end
     return self.y
   end
 
@@ -1192,7 +1195,11 @@ do -- COORDINATE
   -- @param #number y The y coordinate.
   -- @return #COORDINATE
   function COORDINATE:SetY( y )
+    if self:IsInstanceOf("POINT_VEC2") then
+      self.z = y
+    else
       self.y = y
+    end
     return self
   end
 
@@ -1289,7 +1296,11 @@ do -- COORDINATE
   -- @param #number y The y coordinate value to add to the current y coordinate.
   -- @return #COORDINATE
   function COORDINATE:AddY( y )
+    if self:IsInstanceOf("POINT_VEC2") then
+      return self:AddZ(y)
+    else
       self.y = self.y + y
+    end
     return self
   end
 

Moose Development/Moose/Core/Zone_Detection.lua

@@ -202,4 +202,3 @@ function ZONE_DETECTION:IsVec3InZone( Vec3 )
 
   return InZone
 end
-

docs/archive/classes-core.md

@@ -169,7 +169,7 @@ Defines an extensive API to manage 3D points in the DCS World 3D simulation spac
 **Features:**
 
   * Provides a COORDINATE class, which allows to manage points in 3D space and perform various operations on it.
-  * Provides a POINT_VEC2 class, which is derived from COORDINATE, and allows to manage points in 3D space, but from a
+  * Provides a COORDINATE class, which is derived from COORDINATE, and allows to manage points in 3D space, but from a
     Lat/Lon and Altitude perspective.
   * Provides a POINT_VEC3 class, which is derived from COORDINATE, and allows to manage points in 3D space, but from a
     X, Z and Y vector perspective.