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

# Conflicts:
#	Moose Development/Moose/Wrapper/Positionable.lua
#	Moose Development/Moose/Wrapper/Unit.lua

Moose Development/Moose/Ops/Auftrag.lua

@@ -5579,7 +5579,13 @@ function AUFTRAG:GetMissionWaypointCoord(group, randomradius, surfacetypes)
   end
 
   -- Create waypoint coordinate half way between us and the target.
-  local waypointcoord=group:GetCoordinate():GetIntermediateCoordinate(self:GetTargetCoordinate(), self.missionFraction)
+  local waypointcoord=COORDINATE:New(0,0,0)
+  local coord=group:GetCoordinate()
+  if coord then
+    waypointcoord=coord:GetIntermediateCoordinate(self:GetTargetCoordinate(), self.missionFraction)
+  else
+    self:E(self.lid..string.format("ERROR: Cannot get coordinate of group %s (alive=%s)!", tostring(group:GetName()), tostring(group:IsAlive())))
+  end
   local alt=waypointcoord.y
 
   -- Add some randomization.

Moose Development/Moose/Ops/Chief.lua

@@ -2579,7 +2579,9 @@ function CHIEF:CheckOpsZoneQueue()
     local zoneName=stratzone.opszone.zone:GetName()
         
     -- Check coalition and importance.
-    if ownercoalition~=self.coalition and (stratzone.importance==nil or stratzone.importance<=vip) and (not stratzone.opszone:IsStopped()) then
+    if (ownercoalition~=self.coalition or (ownercoalition==self.coalition and stratzone.opszone:IsEmpty())) 
+      and (stratzone.importance==nil or stratzone.importance<=vip) 
+      and (not stratzone.opszone:IsStopped()) then
 
       -- Debug info.
       self:T(self.lid..string.format("Zone %s [%s] is owned by coalition %d", zoneName, stratzone.opszone:GetState(), ownercoalition))