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

Conflicts:
	src/server/game/Movement/Spline/MoveSplineInit.cpp

src/server/game/Movement/Spline/MoveSplineInit.cpp

@@ -71,10 +71,10 @@ namespace Movement
             real_position.z = unit->GetTransOffsetZ();
             real_position.orientation = unit->GetTransOffsetO();
         }
-
         // there is a big chance that current position is unknown if current state is not finalized, need compute it
         // this also allows CalculatePath spline position and update map position in much greater intervals
-        if (!move_spline.Finalized())
+        // Don't compute for transport movement. The unit could be in a motion between two transports, thus having transport moveflag but is resulting in regular positions
+        else if (!move_spline.Finalized())
             real_position = move_spline.ComputePosition();
 
         // should i do the things that user should do? - no.