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

Conflicts:
	world/client.cpp
	world/worlddb.cpp
	zone/aggro.cpp
	zone/bot.cpp
	zone/client.cpp
	zone/client_packet.cpp
	zone/client_process.cpp
	zone/doors.cpp
	zone/entity.cpp
	zone/inventory.cpp
	zone/mob_ai.cpp
	zone/perl_client.cpp
	zone/spells.cpp
	zone/waypoints.cpp
	zone/zone.cpp
	zone/zonedb.cpp
	zone/zoning.cpp

zone/perl_entity.cpp

@@ -1875,7 +1875,7 @@ XS(XS_EntityList_GetRandomClient)
 				c = INT2PTR(Client *,tmp);
 			}
 		}
-		RETVAL = entity_list.GetRandomClient(x, y, z, d * d, c);
+		RETVAL = entity_list.GetRandomClient(xyz_location(x, y, z), d * d, c);
 		ST(0) = sv_newmortal();
 		sv_setref_pv(ST(0), "Client", (void*)RETVAL);
 	}