Merge branch 'master' into jgrpp

# Conflicts:
#	source.list
#	src/blitter/32bpp_anim.cpp
#	src/linkgraph/linkgraphjob.cpp
#	src/order_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_type.h

src/vehicle_cmd.cpp

@@ -143,7 +143,7 @@ CommandCost CmdBuildVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
 	/* Vehicle construction needs random bits, so we have to save the random
 	 * seeds to prevent desyncs. */
 	SavedRandomSeeds saved_seeds;
-	if (flags != subflags) SaveRandomSeeds(&saved_seeds);
+	SaveRandomSeeds(&saved_seeds);
 
 	Vehicle *v = nullptr;
 	switch (type) {
@@ -194,6 +194,7 @@ CommandCost CmdBuildVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
 		}
 	}
 
+	/* Only restore if we actually did some refitting */
 	if (flags != subflags) RestoreRandomSeeds(saved_seeds);
 
 	return value;