308 files changed, 225 insertions, 178 deletions
diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
index 2ad3b17b9f9..5f2448049d0 100644
--- a/sql/base/auth_database.sql
+++ b/sql/base/auth_database.sql
@@ -549,4 +549,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2015-03-21 21:48:22
+-- Dump completed on 2015-07-14  1:06:49
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
index f3c76ce2a79..588ed0063db 100644
--- a/sql/base/characters_database.sql
+++ b/sql/base/characters_database.sql
@@ -2511,7 +2511,7 @@ CREATE TABLE `updates` (
 
 LOCK TABLES `updates` WRITE;
 /*!40000 ALTER TABLE `updates` DISABLE KEYS */;
-INSERT INTO `updates` VALUES ('2015_03_20_00_characters.sql','B761760804EA73BD297F296C5C1919687DF7191C','ARCHIVED','2015-03-21 21:44:15',0),('2015_03_20_01_characters.sql','894F08B70449A5481FFAF394EE5571D7FC4D8A3A','ARCHIVED','2015-03-21 21:44:15',0),('2015_03_20_02_characters.sql','97D7BE0CAADC79F3F11B9FD296B8C6CD40FE593B','ARCHIVED','2015-03-21 21:44:51',0), ('2015_06_26_00_characters_335.sql','f8230a59a9e878a6f54f421d6621f1595bd93861','RELEASED','2015-03-21 21:44:51',0);
+INSERT INTO `updates` VALUES ('2015_03_20_00_characters.sql','B761760804EA73BD297F296C5C1919687DF7191C','ARCHIVED','2015-03-21 21:44:15',0),('2015_03_20_01_characters.sql','894F08B70449A5481FFAF394EE5571D7FC4D8A3A','ARCHIVED','2015-03-21 21:44:15',0),('2015_03_20_02_characters.sql','97D7BE0CAADC79F3F11B9FD296B8C6CD40FE593B','ARCHIVED','2015-03-21 21:44:51',0),('2015_06_26_00_characters_335.sql','C2CC6E50AFA1ACCBEBF77CC519AAEB09F3BBAEBC','ARCHIVED','2015-07-13 23:49:22',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2596,4 +2596,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2015-06-25 17:43:13
+-- Dump completed on 2015-07-14  1:06:50
diff --git a/sql/base/dev/world_database.sql b/sql/base/dev/world_database.sql
index 6f65e52a784..e2277d77a65 100644
--- a/sql/base/dev/world_database.sql
+++ b/sql/base/dev/world_database.sql
@@ -145,16 +145,16 @@ DROP TABLE IF EXISTS `areatrigger_teleport`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `areatrigger_teleport` (
-  `id` mediumint(8) unsigned NOT NULL DEFAULT '0' COMMENT 'Identifier',
-  `name` text,
+  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `Name` text,
   `target_map` smallint(5) unsigned NOT NULL DEFAULT '0',
   `target_position_x` float NOT NULL DEFAULT '0',
   `target_position_y` float NOT NULL DEFAULT '0',
   `target_position_z` float NOT NULL DEFAULT '0',
   `target_orientation` float NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(5) DEFAULT '0',
-  PRIMARY KEY (`id`),
-  FULLTEXT KEY `name` (`name`)
+  PRIMARY KEY (`ID`),
+  FULLTEXT KEY `name` (`Name`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Trigger System';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -166,7 +166,7 @@ DROP TABLE IF EXISTS `battleground_template`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `battleground_template` (
-  `id` mediumint(8) unsigned NOT NULL,
+  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `MinPlayersPerTeam` smallint(5) unsigned NOT NULL DEFAULT '0',
   `MaxPlayersPerTeam` smallint(5) unsigned NOT NULL DEFAULT '0',
   `MinLvl` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -179,7 +179,7 @@ CREATE TABLE `battleground_template` (
   `Weight` tinyint(3) unsigned NOT NULL DEFAULT '1',
   `ScriptName` char(64) NOT NULL DEFAULT '',
   `Comment` char(32) NOT NULL,
-  PRIMARY KEY (`id`)
+  PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -354,13 +354,13 @@ DROP TABLE IF EXISTS `creature_equip_template`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `creature_equip_template` (
-  `entry` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `id` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `itemEntry1` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `itemEntry2` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `itemEntry3` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `CreatureID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `ID` tinyint(3) unsigned NOT NULL DEFAULT '1',
+  `ItemID1` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `ItemID2` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `ItemID3` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(5) DEFAULT '0',
-  PRIMARY KEY (`entry`,`id`)
+  PRIMARY KEY (`CreatureID`,`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -372,8 +372,8 @@ DROP TABLE IF EXISTS `creature_formations`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `creature_formations` (
-  `leaderGUID` int(10) unsigned NOT NULL,
-  `memberGUID` int(10) unsigned NOT NULL,
+  `leaderGUID` int(10) unsigned NOT NULL DEFAULT '0',
+  `memberGUID` int(10) unsigned NOT NULL DEFAULT '0',
   `dist` float unsigned NOT NULL,
   `angle` float unsigned NOT NULL,
   `groupAI` int(10) unsigned NOT NULL,
@@ -413,12 +413,12 @@ DROP TABLE IF EXISTS `creature_model_info`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `creature_model_info` (
-  `modelid` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `bounding_radius` float NOT NULL DEFAULT '0',
-  `combat_reach` float NOT NULL DEFAULT '0',
-  `gender` tinyint(3) unsigned NOT NULL DEFAULT '2',
-  `modelid_other_gender` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (`modelid`)
+  `DisplayID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `BoundingRadius` float NOT NULL DEFAULT '0',
+  `CombatReach` float NOT NULL DEFAULT '0',
+  `Gender` tinyint(3) unsigned NOT NULL DEFAULT '2',
+  `DisplayID_Other_Gender` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`DisplayID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Creature System (Model related info)';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -459,6 +459,21 @@ CREATE TABLE `creature_questender` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `creature_questitem`
+--
+
+DROP TABLE IF EXISTS `creature_questitem`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `creature_questitem` (
+  `CreatureEntry` int(10) unsigned NOT NULL DEFAULT '0',
+  `Idx` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemId` int(10) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`CreatureEntry`,`Idx`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `creature_queststarter`
 --
 
@@ -571,12 +586,6 @@ CREATE TABLE `creature_template` (
   `DamageModifier` float NOT NULL DEFAULT '1',
   `ExperienceModifier` float NOT NULL DEFAULT '1',
   `RacialLeader` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `questItem1` int(10) unsigned NOT NULL DEFAULT '0',
-  `questItem2` int(10) unsigned NOT NULL DEFAULT '0',
-  `questItem3` int(10) unsigned NOT NULL DEFAULT '0',
-  `questItem4` int(10) unsigned NOT NULL DEFAULT '0',
-  `questItem5` int(10) unsigned NOT NULL DEFAULT '0',
-  `questItem6` int(10) unsigned NOT NULL DEFAULT '0',
   `movementId` int(11) unsigned NOT NULL DEFAULT '0',
   `RegenHealth` tinyint(3) unsigned NOT NULL DEFAULT '1',
   `mechanic_immune_mask` int(10) unsigned NOT NULL DEFAULT '0',
@@ -1056,6 +1065,21 @@ CREATE TABLE `gameobject` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `gameobject_addon`
+--
+
+DROP TABLE IF EXISTS `gameobject_addon`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `gameobject_addon` (
+  `guid` int(10) unsigned NOT NULL DEFAULT '0',
+  `invisibilityType` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `invisibilityValue` int(10) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`guid`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `gameobject_loot_template`
 --
 
@@ -1092,6 +1116,21 @@ CREATE TABLE `gameobject_questender` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `gameobject_questitem`
+--
+
+DROP TABLE IF EXISTS `gameobject_questitem`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `gameobject_questitem` (
+  `GameObjectEntry` int(10) unsigned NOT NULL DEFAULT '0',
+  `Idx` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemId` int(10) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`GameObjectEntry`,`Idx`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `gameobject_queststarter`
 --
 
@@ -1123,36 +1162,30 @@ CREATE TABLE `gameobject_template` (
   `faction` smallint(5) unsigned NOT NULL DEFAULT '0',
   `flags` int(10) unsigned NOT NULL DEFAULT '0',
   `size` float NOT NULL DEFAULT '1',
-  `questItem1` int(11) unsigned NOT NULL DEFAULT '0',
-  `questItem2` int(11) unsigned NOT NULL DEFAULT '0',
-  `questItem3` int(11) unsigned NOT NULL DEFAULT '0',
-  `questItem4` int(11) unsigned NOT NULL DEFAULT '0',
-  `questItem5` int(11) unsigned NOT NULL DEFAULT '0',
-  `questItem6` int(11) unsigned NOT NULL DEFAULT '0',
-  `data0` int(10) unsigned NOT NULL DEFAULT '0',
-  `data1` int(11) NOT NULL DEFAULT '-1',
-  `data2` int(10) unsigned NOT NULL DEFAULT '0',
-  `data3` int(10) unsigned NOT NULL DEFAULT '0',
-  `data4` int(10) unsigned NOT NULL DEFAULT '0',
-  `data5` int(10) unsigned NOT NULL DEFAULT '0',
-  `data6` int(11) NOT NULL DEFAULT '-1',
-  `data7` int(10) unsigned NOT NULL DEFAULT '0',
-  `data8` int(10) unsigned NOT NULL DEFAULT '0',
-  `data9` int(10) unsigned NOT NULL DEFAULT '0',
-  `data10` int(10) unsigned NOT NULL DEFAULT '0',
-  `data11` int(10) unsigned NOT NULL DEFAULT '0',
-  `data12` int(10) unsigned NOT NULL DEFAULT '0',
-  `data13` int(10) unsigned NOT NULL DEFAULT '0',
-  `data14` int(10) unsigned NOT NULL DEFAULT '0',
-  `data15` int(10) unsigned NOT NULL DEFAULT '0',
-  `data16` int(10) unsigned NOT NULL DEFAULT '0',
-  `data17` int(10) unsigned NOT NULL DEFAULT '0',
-  `data18` int(10) unsigned NOT NULL DEFAULT '0',
-  `data19` int(10) unsigned NOT NULL DEFAULT '0',
-  `data20` int(10) unsigned NOT NULL DEFAULT '0',
-  `data21` int(10) unsigned NOT NULL DEFAULT '0',
-  `data22` int(10) unsigned NOT NULL DEFAULT '0',
-  `data23` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data0` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data1` int(11) NOT NULL DEFAULT '0',
+  `Data2` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data3` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data4` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data5` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data6` int(11) NOT NULL DEFAULT '0',
+  `Data7` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data8` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data9` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data10` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data11` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data12` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data13` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data14` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data15` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data16` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data17` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data18` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data19` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data20` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data21` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data22` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data23` int(10) unsigned NOT NULL DEFAULT '0',
   `AIName` char(64) NOT NULL DEFAULT '',
   `ScriptName` varchar(64) NOT NULL DEFAULT '',
   `VerifiedBuild` smallint(5) DEFAULT '0',
@@ -1456,13 +1489,13 @@ CREATE TABLE `lfg_dungeon_rewards` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `lfg_entrances`
+-- Table structure for table `lfg_dungeon_template`
 --
 
-DROP TABLE IF EXISTS `lfg_entrances`;
+DROP TABLE IF EXISTS `lfg_dungeon_template`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `lfg_entrances` (
+CREATE TABLE `lfg_dungeon_template` (
   `dungeonId` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Unique id from LFGDungeons.dbc',
   `name` varchar(255) CHARACTER SET latin1 DEFAULT NULL,
   `position_x` float NOT NULL DEFAULT '0',
@@ -2087,7 +2120,7 @@ CREATE TABLE `npc_text` (
   `text0_1` longtext,
   `BroadcastTextID0` mediumint(6) NOT NULL DEFAULT '0',
   `lang0` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `prob0` float NOT NULL DEFAULT '0',
+  `Probability0` float NOT NULL DEFAULT '0',
   `em0_0` smallint(5) unsigned NOT NULL DEFAULT '0',
   `em0_1` smallint(5) unsigned NOT NULL DEFAULT '0',
   `em0_2` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -2098,7 +2131,7 @@ CREATE TABLE `npc_text` (
   `text1_1` longtext,
   `BroadcastTextID1` mediumint(6) NOT NULL DEFAULT '0',
   `lang1` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `prob1` float NOT NULL DEFAULT '0',
+  `Probability1` float NOT NULL DEFAULT '0',
   `em1_0` smallint(5) unsigned NOT NULL DEFAULT '0',
   `em1_1` smallint(5) unsigned NOT NULL DEFAULT '0',
   `em1_2` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -2109,7 +2142,7 @@ CREATE TABLE `npc_text` (
   `text2_1` longtext,
   `BroadcastTextID2` mediumint(6) NOT NULL DEFAULT '0',
   `lang2` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `prob2` float NOT NULL DEFAULT '0',
+  `Probability2` float NOT NULL DEFAULT '0',
   `em2_0` smallint(5) unsigned NOT NULL DEFAULT '0',
   `em2_1` smallint(5) unsigned NOT NULL DEFAULT '0',
   `em2_2` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -2120,7 +2153,7 @@ CREATE TABLE `npc_text` (
   `text3_1` longtext,
   `BroadcastTextID3` mediumint(6) NOT NULL DEFAULT '0',
   `lang3` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `prob3` float NOT NULL DEFAULT '0',
+  `Probability3` float NOT NULL DEFAULT '0',
   `em3_0` smallint(5) unsigned NOT NULL DEFAULT '0',
   `em3_1` smallint(5) unsigned NOT NULL DEFAULT '0',
   `em3_2` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -2131,7 +2164,7 @@ CREATE TABLE `npc_text` (
   `text4_1` longtext,
   `BroadcastTextID4` mediumint(6) NOT NULL DEFAULT '0',
   `lang4` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `prob4` float NOT NULL DEFAULT '0',
+  `Probability4` float NOT NULL DEFAULT '0',
   `em4_0` smallint(5) unsigned NOT NULL DEFAULT '0',
   `em4_1` smallint(5) unsigned NOT NULL DEFAULT '0',
   `em4_2` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -2142,7 +2175,7 @@ CREATE TABLE `npc_text` (
   `text5_1` longtext,
   `BroadcastTextID5` mediumint(6) NOT NULL DEFAULT '0',
   `lang5` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `prob5` float NOT NULL DEFAULT '0',
+  `Probability5` float NOT NULL DEFAULT '0',
   `em5_0` smallint(5) unsigned NOT NULL DEFAULT '0',
   `em5_1` smallint(5) unsigned NOT NULL DEFAULT '0',
   `em5_2` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -2153,7 +2186,7 @@ CREATE TABLE `npc_text` (
   `text6_1` longtext,
   `BroadcastTextID6` mediumint(6) NOT NULL DEFAULT '0',
   `lang6` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `prob6` float NOT NULL DEFAULT '0',
+  `Probability6` float NOT NULL DEFAULT '0',
   `em6_0` smallint(5) unsigned NOT NULL DEFAULT '0',
   `em6_1` smallint(5) unsigned NOT NULL DEFAULT '0',
   `em6_2` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -2164,7 +2197,7 @@ CREATE TABLE `npc_text` (
   `text7_1` longtext,
   `BroadcastTextID7` mediumint(6) NOT NULL DEFAULT '0',
   `lang7` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `prob7` float NOT NULL DEFAULT '0',
+  `Probability7` float NOT NULL DEFAULT '0',
   `em7_0` smallint(5) unsigned NOT NULL DEFAULT '0',
   `em7_1` smallint(5) unsigned NOT NULL DEFAULT '0',
   `em7_2` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -2184,13 +2217,13 @@ DROP TABLE IF EXISTS `npc_trainer`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `npc_trainer` (
-  `entry` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `spell` mediumint(8) NOT NULL DEFAULT '0',
-  `spellcost` int(10) unsigned NOT NULL DEFAULT '0',
-  `reqskill` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `reqskillvalue` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `reqlevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (`entry`,`spell`)
+  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `SpellID` mediumint(8) NOT NULL DEFAULT '0',
+  `MoneyCost` int(10) unsigned NOT NULL DEFAULT '0',
+  `ReqSkillLine` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ReqSkillRank` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ReqLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`SpellID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -2237,11 +2270,11 @@ DROP TABLE IF EXISTS `page_text`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `page_text` (
-  `entry` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `text` longtext NOT NULL,
-  `next_page` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `Text` longtext NOT NULL,
+  `NextPageID` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(5) DEFAULT '0',
-  PRIMARY KEY (`entry`)
+  PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Item System';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -2439,9 +2472,9 @@ DROP TABLE IF EXISTS `player_xp_for_level`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `player_xp_for_level` (
-  `lvl` tinyint(3) unsigned NOT NULL,
-  `xp_for_next_level` int(10) unsigned NOT NULL,
-  PRIMARY KEY (`lvl`)
+  `Level` tinyint(3) unsigned NOT NULL,
+  `Experience` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`Level`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -2541,15 +2574,15 @@ DROP TABLE IF EXISTS `points_of_interest`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `points_of_interest` (
-  `entry` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `x` float NOT NULL DEFAULT '0',
-  `y` float NOT NULL DEFAULT '0',
-  `icon` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `flags` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `data` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `icon_name` text NOT NULL,
+  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `PositionX` float NOT NULL DEFAULT '0',
+  `PositionY` float NOT NULL DEFAULT '0',
+  `Icon` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `Flags` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `Data` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `Name` text NOT NULL,
   `VerifiedBuild` smallint(5) DEFAULT '0',
-  PRIMARY KEY (`entry`)
+  PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -2664,17 +2697,17 @@ DROP TABLE IF EXISTS `quest_poi`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `quest_poi` (
-  `questId` int(10) unsigned NOT NULL DEFAULT '0',
+  `QuestID` int(10) unsigned NOT NULL DEFAULT '0',
   `id` int(10) unsigned NOT NULL DEFAULT '0',
-  `objIndex` int(11) NOT NULL DEFAULT '0',
-  `mapid` int(10) unsigned NOT NULL DEFAULT '0',
+  `ObjectiveIndex` int(11) NOT NULL DEFAULT '0',
+  `MapID` int(10) unsigned NOT NULL DEFAULT '0',
   `WorldMapAreaId` int(10) unsigned NOT NULL DEFAULT '0',
-  `FloorId` int(10) unsigned NOT NULL DEFAULT '0',
-  `unk3` int(10) unsigned NOT NULL DEFAULT '0',
-  `unk4` int(10) unsigned NOT NULL DEFAULT '0',
+  `Floor` int(10) unsigned NOT NULL DEFAULT '0',
+  `Priority` int(10) unsigned NOT NULL DEFAULT '0',
+  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(5) DEFAULT '0',
-  PRIMARY KEY (`questId`,`id`),
-  KEY `idx` (`questId`,`id`)
+  PRIMARY KEY (`QuestID`,`id`),
+  KEY `idx` (`QuestID`,`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -2686,14 +2719,14 @@ DROP TABLE IF EXISTS `quest_poi_points`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `quest_poi_points` (
-  `questId` int(10) unsigned NOT NULL DEFAULT '0',
-  `id` int(10) unsigned NOT NULL DEFAULT '0',
-  `idx` int(10) unsigned NOT NULL DEFAULT '0',
-  `x` int(11) NOT NULL DEFAULT '0',
-  `y` int(11) NOT NULL DEFAULT '0',
+  `QuestID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Idx1` int(10) unsigned NOT NULL DEFAULT '0',
+  `Idx2` int(10) unsigned NOT NULL DEFAULT '0',
+  `X` int(11) NOT NULL DEFAULT '0',
+  `Y` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(5) DEFAULT '0',
-  PRIMARY KEY (`questId`,`id`,`idx`),
-  KEY `questId_id` (`questId`,`id`)
+  PRIMARY KEY (`QuestID`,`Idx1`,`Idx2`),
+  KEY `questId_id` (`QuestID`,`Idx1`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -2705,30 +2738,19 @@ DROP TABLE IF EXISTS `quest_template`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `quest_template` (
-  `Id` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `Method` tinyint(3) unsigned NOT NULL DEFAULT '2',
-  `Level` smallint(3) NOT NULL DEFAULT '1',
+  `QuestLevel` smallint(3) NOT NULL DEFAULT '1',
   `MinLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `MaxLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `ZoneOrSort` smallint(6) NOT NULL DEFAULT '0',
-  `Type` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `SuggestedPlayers` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `QuestSortID` smallint(6) NOT NULL DEFAULT '0',
+  `QuestType` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `SuggestedGroupNum` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `LimitTime` int(10) unsigned NOT NULL DEFAULT '0',
-  `RequiredClasses` smallint(5) unsigned NOT NULL DEFAULT '0',
   `RequiredRaces` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RequiredSkillId` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RequiredSkillPoints` smallint(5) unsigned NOT NULL DEFAULT '0',
   `RequiredFactionId1` smallint(5) unsigned NOT NULL DEFAULT '0',
   `RequiredFactionId2` smallint(5) unsigned NOT NULL DEFAULT '0',
   `RequiredFactionValue1` mediumint(8) NOT NULL DEFAULT '0',
   `RequiredFactionValue2` mediumint(8) NOT NULL DEFAULT '0',
-  `RequiredMinRepFaction` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RequiredMaxRepFaction` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RequiredMinRepValue` mediumint(8) NOT NULL DEFAULT '0',
-  `RequiredMaxRepValue` mediumint(8) NOT NULL DEFAULT '0',
-  `PrevQuestId` mediumint(8) NOT NULL DEFAULT '0',
-  `NextQuestId` mediumint(8) NOT NULL DEFAULT '0',
-  `ExclusiveGroup` mediumint(8) NOT NULL DEFAULT '0',
   `NextQuestIdChain` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `RewardXPId` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `RewardOrRequiredMoney` int(11) NOT NULL DEFAULT '0',
@@ -2737,63 +2759,58 @@ CREATE TABLE `quest_template` (
   `RewardSpellCast` int(11) NOT NULL DEFAULT '0',
   `RewardHonor` int(11) NOT NULL DEFAULT '0',
   `RewardHonorMultiplier` float NOT NULL DEFAULT '0',
-  `RewardMailTemplateId` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RewardMailDelay` int(11) unsigned NOT NULL DEFAULT '0',
   `SourceItemId` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `SourceItemCount` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `SourceSpellId` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `Flags` int(10) unsigned NOT NULL DEFAULT '0',
-  `SpecialFlags` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `RewardTitleId` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `RewardTitle` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `RequiredPlayerKills` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `RewardTalents` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `RewardArenaPoints` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RewardItemId1` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RewardItemId2` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RewardItemId3` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RewardItemId4` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RewardItemCount1` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RewardItemCount2` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RewardItemCount3` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RewardItemCount4` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RewardChoiceItemId1` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RewardChoiceItemId2` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RewardChoiceItemId3` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RewardChoiceItemId4` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RewardChoiceItemId5` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RewardChoiceItemId6` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RewardChoiceItemCount1` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RewardChoiceItemCount2` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RewardChoiceItemCount3` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RewardChoiceItemCount4` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RewardChoiceItemCount5` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RewardChoiceItemCount6` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RewardFactionId1` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case',
-  `RewardFactionId2` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case',
-  `RewardFactionId3` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case',
-  `RewardFactionId4` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case',
-  `RewardFactionId5` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case',
-  `RewardFactionValueId1` mediumint(8) NOT NULL DEFAULT '0',
-  `RewardFactionValueId2` mediumint(8) NOT NULL DEFAULT '0',
-  `RewardFactionValueId3` mediumint(8) NOT NULL DEFAULT '0',
-  `RewardFactionValueId4` mediumint(8) NOT NULL DEFAULT '0',
-  `RewardFactionValueId5` mediumint(8) NOT NULL DEFAULT '0',
-  `RewardFactionValueIdOverride1` mediumint(8) NOT NULL DEFAULT '0',
-  `RewardFactionValueIdOverride2` mediumint(8) NOT NULL DEFAULT '0',
-  `RewardFactionValueIdOverride3` mediumint(8) NOT NULL DEFAULT '0',
-  `RewardFactionValueIdOverride4` mediumint(8) NOT NULL DEFAULT '0',
-  `RewardFactionValueIdOverride5` mediumint(8) NOT NULL DEFAULT '0',
+  `RewardItem1` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `RewardItem2` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `RewardItem3` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `RewardItem4` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `RewardAmount1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RewardAmount2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RewardAmount3` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RewardAmount4` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemID1` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemID2` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemID3` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemID4` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemID5` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemID6` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemQuantity1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemQuantity2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemQuantity3` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemQuantity4` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemQuantity5` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemQuantity6` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RewardFactionID1` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case',
+  `RewardFactionID2` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case',
+  `RewardFactionID3` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case',
+  `RewardFactionID4` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case',
+  `RewardFactionID5` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case',
+  `RewardFactionValue1` mediumint(8) NOT NULL DEFAULT '0',
+  `RewardFactionValue2` mediumint(8) NOT NULL DEFAULT '0',
+  `RewardFactionValue3` mediumint(8) NOT NULL DEFAULT '0',
+  `RewardFactionValue4` mediumint(8) NOT NULL DEFAULT '0',
+  `RewardFactionValue5` mediumint(8) NOT NULL DEFAULT '0',
+  `RewardFactionOverride1` mediumint(8) NOT NULL DEFAULT '0',
+  `RewardFactionOverride2` mediumint(8) NOT NULL DEFAULT '0',
+  `RewardFactionOverride3` mediumint(8) NOT NULL DEFAULT '0',
+  `RewardFactionOverride4` mediumint(8) NOT NULL DEFAULT '0',
+  `RewardFactionOverride5` mediumint(8) NOT NULL DEFAULT '0',
   `PointMapId` smallint(5) unsigned NOT NULL DEFAULT '0',
   `PointX` float NOT NULL DEFAULT '0',
   `PointY` float NOT NULL DEFAULT '0',
   `PointOption` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `Title` text,
-  `Objectives` text,
-  `Details` text,
+  `LogTitle` text,
+  `LogDescription` text,
+  `QuestDescription` text,
   `EndText` text,
   `OfferRewardText` text,
   `RequestItemsText` text,
-  `CompletedText` text,
+  `QuestCompletionLog` text,
   `RequiredNpcOrGo1` mediumint(8) NOT NULL DEFAULT '0',
   `RequiredNpcOrGo2` mediumint(8) NOT NULL DEFAULT '0',
   `RequiredNpcOrGo3` mediumint(8) NOT NULL DEFAULT '0',
@@ -2846,11 +2863,40 @@ CREATE TABLE `quest_template` (
   `OfferRewardEmoteDelay3` int(10) unsigned NOT NULL DEFAULT '0',
   `OfferRewardEmoteDelay4` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(5) DEFAULT '0',
-  PRIMARY KEY (`Id`)
+  PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Quest System';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `quest_template_addon`
+--
+
+DROP TABLE IF EXISTS `quest_template_addon`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `quest_template_addon` (
+  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `MaxLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `AllowableClasses` int(10) unsigned NOT NULL DEFAULT '0',
+  `SourceSpellID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `PrevQuestID` mediumint(8) NOT NULL DEFAULT '0',
+  `NextQuestID` mediumint(8) NOT NULL DEFAULT '0',
+  `ExclusiveGroup` mediumint(8) NOT NULL DEFAULT '0',
+  `RewardMailTemplateID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `RewardMailDelay` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredSkillID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RequiredSkillPoints` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RequiredMinRepFaction` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RequiredMaxRepFaction` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RequiredMinRepValue` mediumint(8) NOT NULL DEFAULT '0',
+  `RequiredMaxRepValue` mediumint(8) NOT NULL DEFAULT '0',
+  `ProvidedItemCount` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `SpecialFlags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `reference_loot_template`
 --
 
@@ -3443,15 +3489,15 @@ DROP TABLE IF EXISTS `spell_target_position`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `spell_target_position` (
-  `id` mediumint(8) unsigned NOT NULL DEFAULT '0' COMMENT 'Identifier',
-  `effIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `target_map` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `target_position_x` float NOT NULL DEFAULT '0',
-  `target_position_y` float NOT NULL DEFAULT '0',
-  `target_position_z` float NOT NULL DEFAULT '0',
-  `target_orientation` float NOT NULL DEFAULT '0',
+  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0' COMMENT 'Identifier',
+  `EffectIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MapID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `PositionX` float NOT NULL DEFAULT '0',
+  `PositionY` float NOT NULL DEFAULT '0',
+  `PositionZ` float NOT NULL DEFAULT '0',
+  `Orientation` float NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(5) DEFAULT '0',
-  PRIMARY KEY (`id`,`effIndex`)
+  PRIMARY KEY (`ID`,`EffectIndex`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Spell System';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -3705,4 +3751,4 @@ CREATE TABLE `waypoints` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2015-03-22 20:02:11
+-- Dump completed on 2015-07-14  1:06:51
diff --git a/sql/updates/characters/2015_06_26_00_characters_335.sql b/sql/old/3.3.5a/characters/58_2015_03_21/2015_06_26_00_characters_335.sql
index ea997fad252..ea997fad252 100644
--- a/sql/updates/characters/2015_06_26_00_characters_335.sql
+++ b/sql/old/3.3.5a/characters/58_2015_03_21/2015_06_26_00_characters_335.sql
diff --git a/sql/updates/world/2015_03_21_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_21_00_world.sql
index d1eee836dd0..d1eee836dd0 100644
--- a/sql/updates/world/2015_03_21_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_21_00_world.sql
diff --git a/sql/updates/world/2015_03_21_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_21_01_world.sql
index 82b5304ef7b..82b5304ef7b 100644
--- a/sql/updates/world/2015_03_21_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_21_01_world.sql
diff --git a/sql/updates/world/2015_03_21_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_21_02_world.sql
index 831bf907912..831bf907912 100644
--- a/sql/updates/world/2015_03_21_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_21_02_world.sql
diff --git a/sql/updates/world/2015_03_22_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_22_00_world.sql
index 97ecb115bc2..97ecb115bc2 100644
--- a/sql/updates/world/2015_03_22_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_22_00_world.sql
diff --git a/sql/updates/world/2015_03_22_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_22_01_world.sql
index 07e759465dc..07e759465dc 100644
--- a/sql/updates/world/2015_03_22_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_22_01_world.sql
diff --git a/sql/updates/world/2015_03_22_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_22_02_world.sql
index 4fd3f5b8e25..4fd3f5b8e25 100644
--- a/sql/updates/world/2015_03_22_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_22_02_world.sql
diff --git a/sql/updates/world/2015_03_22_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_22_03_world.sql
index 8b59ea0824c..8b59ea0824c 100644
--- a/sql/updates/world/2015_03_22_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_22_03_world.sql
diff --git a/sql/updates/world/2015_03_22_04_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_22_04_world.sql
index d468134a279..d468134a279 100644
--- a/sql/updates/world/2015_03_22_04_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_22_04_world.sql
diff --git a/sql/updates/world/2015_03_22_05_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_22_05_world.sql
index 6e81be445da..6e81be445da 100644
--- a/sql/updates/world/2015_03_22_05_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_22_05_world.sql
diff --git a/sql/updates/world/2015_03_22_06_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_22_06_world.sql
index db8227afff8..db8227afff8 100644
--- a/sql/updates/world/2015_03_22_06_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_22_06_world.sql
diff --git a/sql/updates/world/2015_03_22_07_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_22_07_world.sql
index 1e5c6607bee..1e5c6607bee 100644
--- a/sql/updates/world/2015_03_22_07_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_22_07_world.sql
diff --git a/sql/updates/world/2015_03_23_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_00_world.sql
index 32f90e439d6..32f90e439d6 100644
--- a/sql/updates/world/2015_03_23_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_00_world.sql
diff --git a/sql/updates/world/2015_03_23_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_01_world.sql
index d6f8d4591ff..d6f8d4591ff 100644
--- a/sql/updates/world/2015_03_23_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_01_world.sql
diff --git a/sql/updates/world/2015_03_23_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_02_world.sql
index 3bc255d569e..3bc255d569e 100644
--- a/sql/updates/world/2015_03_23_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_02_world.sql
diff --git a/sql/updates/world/2015_03_23_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_03_world.sql
index bb0a1609876..bb0a1609876 100644
--- a/sql/updates/world/2015_03_23_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_03_world.sql
diff --git a/sql/updates/world/2015_03_23_04_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_04_world.sql
index 1425f517d0a..1425f517d0a 100644
--- a/sql/updates/world/2015_03_23_04_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_04_world.sql
diff --git a/sql/updates/world/2015_03_23_05_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_05_world.sql
index e574ff22bea..e574ff22bea 100644
--- a/sql/updates/world/2015_03_23_05_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_05_world.sql
diff --git a/sql/updates/world/2015_03_23_06_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_06_world.sql
index e8820a341e2..e8820a341e2 100644
--- a/sql/updates/world/2015_03_23_06_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_06_world.sql
diff --git a/sql/updates/world/2015_03_23_07_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_07_world.sql
index ca9bffaf728..ca9bffaf728 100644
--- a/sql/updates/world/2015_03_23_07_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_07_world.sql
diff --git a/sql/updates/world/2015_03_23_08_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_08_world.sql
index c7837c47d9d..c7837c47d9d 100644
--- a/sql/updates/world/2015_03_23_08_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_08_world.sql
diff --git a/sql/updates/world/2015_03_23_09_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_09_world.sql
index d90f7fc9249..d90f7fc9249 100644
--- a/sql/updates/world/2015_03_23_09_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_09_world.sql
diff --git a/sql/updates/world/2015_03_23_10_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_10_world.sql
index d83e5c212a0..d83e5c212a0 100644
--- a/sql/updates/world/2015_03_23_10_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_10_world.sql
diff --git a/sql/updates/world/2015_03_23_11_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_11_world.sql
index 2d3b346d18e..2d3b346d18e 100644
--- a/sql/updates/world/2015_03_23_11_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_11_world.sql
diff --git a/sql/updates/world/2015_03_23_12_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_12_world.sql
index 2471e9bdcf1..2471e9bdcf1 100644
--- a/sql/updates/world/2015_03_23_12_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_12_world.sql
diff --git a/sql/updates/world/2015_03_23_13_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_13_world.sql
index 7e42213583f..7e42213583f 100644
--- a/sql/updates/world/2015_03_23_13_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_23_13_world.sql
diff --git a/sql/updates/world/2015_03_24_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_24_00_world.sql
index 752272710b4..752272710b4 100644
--- a/sql/updates/world/2015_03_24_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_24_00_world.sql
diff --git a/sql/updates/world/2015_03_24_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_24_01_world.sql
index 31034d87c4a..31034d87c4a 100644
--- a/sql/updates/world/2015_03_24_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_24_01_world.sql
diff --git a/sql/updates/world/2015_03_24_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_24_02_world.sql
index b9a49dcc9ba..b9a49dcc9ba 100644
--- a/sql/updates/world/2015_03_24_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_24_02_world.sql
diff --git a/sql/updates/world/2015_03_24_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_24_03_world.sql
index 3012bb6b82a..3012bb6b82a 100644
--- a/sql/updates/world/2015_03_24_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_24_03_world.sql
diff --git a/sql/updates/world/2015_03_24_04_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_24_04_world.sql
index 74488cd00bd..74488cd00bd 100644
--- a/sql/updates/world/2015_03_24_04_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_24_04_world.sql
diff --git a/sql/updates/world/2015_03_24_05_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_24_05_world.sql
index c9faf951751..c9faf951751 100644
--- a/sql/updates/world/2015_03_24_05_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_24_05_world.sql
diff --git a/sql/updates/world/2015_03_25_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_25_00_world.sql
index 06d4910fe05..06d4910fe05 100644
--- a/sql/updates/world/2015_03_25_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_25_00_world.sql
diff --git a/sql/updates/world/2015_03_25_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_25_01_world.sql
index 29dd214f262..29dd214f262 100644
--- a/sql/updates/world/2015_03_25_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_25_01_world.sql
diff --git a/sql/updates/world/2015_03_25_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_25_02_world.sql
index 10b8903f3fb..10b8903f3fb 100644
--- a/sql/updates/world/2015_03_25_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_25_02_world.sql
diff --git a/sql/updates/world/2015_03_25_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_25_03_world.sql
index 3706bde1b71..3706bde1b71 100644
--- a/sql/updates/world/2015_03_25_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_25_03_world.sql
diff --git a/sql/updates/world/2015_03_25_04_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_25_04_world.sql
index 017a0162c5d..017a0162c5d 100644
--- a/sql/updates/world/2015_03_25_04_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_25_04_world.sql
diff --git a/sql/updates/world/2015_03_26_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_26_00_world.sql
index ab759e628f6..ab759e628f6 100644
--- a/sql/updates/world/2015_03_26_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_26_00_world.sql
diff --git a/sql/updates/world/2015_03_26_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_26_01_world.sql
index afd0d99691a..afd0d99691a 100644
--- a/sql/updates/world/2015_03_26_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_26_01_world.sql
diff --git a/sql/updates/world/2015_03_26_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_26_02_world.sql
index 4ae68387d8e..4ae68387d8e 100644
--- a/sql/updates/world/2015_03_26_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_26_02_world.sql
diff --git a/sql/updates/world/2015_03_28_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_28_00_world.sql
index af58d0ecf83..af58d0ecf83 100644
--- a/sql/updates/world/2015_03_28_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_28_00_world.sql
diff --git a/sql/updates/world/2015_03_28_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_28_01_world.sql
index e1d6e6d63dc..e1d6e6d63dc 100644
--- a/sql/updates/world/2015_03_28_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_28_01_world.sql
diff --git a/sql/updates/world/2015_03_30_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_30_00_world.sql
index 10bb642f8a1..10bb642f8a1 100644
--- a/sql/updates/world/2015_03_30_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_30_00_world.sql
diff --git a/sql/updates/world/2015_03_30_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_30_01_world.sql
index 2e62c6cfba3..2e62c6cfba3 100644
--- a/sql/updates/world/2015_03_30_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_30_01_world.sql
diff --git a/sql/updates/world/2015_03_30_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_30_02_world.sql
index e75ccb04142..e75ccb04142 100644
--- a/sql/updates/world/2015_03_30_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_30_02_world.sql
diff --git a/sql/updates/world/2015_03_30_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_30_03_world.sql
index 5c8497edc05..5c8497edc05 100644
--- a/sql/updates/world/2015_03_30_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_03_30_03_world.sql
diff --git a/sql/updates/world/2015_04_01_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_01_00_world.sql
index 68d43c08415..68d43c08415 100644
--- a/sql/updates/world/2015_04_01_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_01_00_world.sql
diff --git a/sql/updates/world/2015_04_01_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_01_01_world.sql
index b53c739e2dd..b53c739e2dd 100644
--- a/sql/updates/world/2015_04_01_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_01_01_world.sql
diff --git a/sql/updates/world/2015_04_02_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_02_00_world.sql
index 683e5c01250..683e5c01250 100644
--- a/sql/updates/world/2015_04_02_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_02_00_world.sql
diff --git a/sql/updates/world/2015_04_02_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_02_01_world.sql
index 135ad4aba65..135ad4aba65 100644
--- a/sql/updates/world/2015_04_02_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_02_01_world.sql
diff --git a/sql/updates/world/2015_04_03_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_03_00_world.sql
index b7471bb9b77..b7471bb9b77 100644
--- a/sql/updates/world/2015_04_03_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_03_00_world.sql
diff --git a/sql/updates/world/2015_04_03_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_03_01_world.sql
index 18bb069439a..18bb069439a 100644
--- a/sql/updates/world/2015_04_03_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_03_01_world.sql
diff --git a/sql/updates/world/2015_04_03_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_03_02_world.sql
index 30198348624..30198348624 100644
--- a/sql/updates/world/2015_04_03_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_03_02_world.sql
diff --git a/sql/updates/world/2015_04_03_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_03_03_world.sql
index 175fdcb89ca..175fdcb89ca 100644
--- a/sql/updates/world/2015_04_03_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_03_03_world.sql
diff --git a/sql/updates/world/2015_04_03_04_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_03_04_world.sql
index 2f50193e413..2f50193e413 100644
--- a/sql/updates/world/2015_04_03_04_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_03_04_world.sql
diff --git a/sql/updates/world/2015_04_03_05_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_03_05_world.sql
index e56d0d607d6..e56d0d607d6 100644
--- a/sql/updates/world/2015_04_03_05_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_03_05_world.sql
diff --git a/sql/updates/world/2015_04_03_06_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_03_06_world.sql
index 77d7a82d9bb..77d7a82d9bb 100644
--- a/sql/updates/world/2015_04_03_06_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_03_06_world.sql
diff --git a/sql/updates/world/2015_04_04_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_04_00_world.sql
index 6b6621136e0..6b6621136e0 100644
--- a/sql/updates/world/2015_04_04_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_04_00_world.sql
diff --git a/sql/updates/world/2015_04_04_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_04_01_world.sql
index 78036014011..78036014011 100644
--- a/sql/updates/world/2015_04_04_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_04_01_world.sql
diff --git a/sql/updates/world/2015_04_04_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_04_02_world.sql
index 1cc2cb61ea3..1cc2cb61ea3 100644
--- a/sql/updates/world/2015_04_04_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_04_02_world.sql
diff --git a/sql/updates/world/2015_04_04_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_04_03_world.sql
index 78e5f2b50b5..78e5f2b50b5 100644
--- a/sql/updates/world/2015_04_04_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_04_03_world.sql
diff --git a/sql/updates/world/2015_04_04_04_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_04_04_world.sql
index 58314391994..58314391994 100644
--- a/sql/updates/world/2015_04_04_04_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_04_04_world.sql
diff --git a/sql/updates/world/2015_04_04_05_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_04_05_world.sql
index dccc4f0c082..dccc4f0c082 100644
--- a/sql/updates/world/2015_04_04_05_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_04_05_world.sql
diff --git a/sql/updates/world/2015_04_04_06_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_04_06_world.sql
index 16034938010..16034938010 100644
--- a/sql/updates/world/2015_04_04_06_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_04_06_world.sql
diff --git a/sql/updates/world/2015_04_05_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_05_00_world.sql
index d37c91586bf..d37c91586bf 100644
--- a/sql/updates/world/2015_04_05_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_05_00_world.sql
diff --git a/sql/updates/world/2015_04_05_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_05_01_world.sql
index 8b8d98fc558..8b8d98fc558 100644
--- a/sql/updates/world/2015_04_05_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_05_01_world.sql
diff --git a/sql/updates/world/2015_04_05_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_05_02_world.sql
index 7b6816fc41e..7b6816fc41e 100644
--- a/sql/updates/world/2015_04_05_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_05_02_world.sql
diff --git a/sql/updates/world/2015_04_05_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_05_03_world.sql
index 261dd6c2a9f..261dd6c2a9f 100644
--- a/sql/updates/world/2015_04_05_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_05_03_world.sql
diff --git a/sql/updates/world/2015_04_05_04_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_05_04_world.sql
index 12fabf12d97..12fabf12d97 100644
--- a/sql/updates/world/2015_04_05_04_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_05_04_world.sql
diff --git a/sql/updates/world/2015_04_05_05_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_05_05_world.sql
index 4d23ec8a4c4..4d23ec8a4c4 100644
--- a/sql/updates/world/2015_04_05_05_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_05_05_world.sql
diff --git a/sql/updates/world/2015_04_05_06_world_335.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_05_06_world_335.sql
index ed7071282ab..ed7071282ab 100644
--- a/sql/updates/world/2015_04_05_06_world_335.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_05_06_world_335.sql
diff --git a/sql/updates/world/2015_04_05_07_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_05_07_world.sql
index af5fb8a8390..af5fb8a8390 100644
--- a/sql/updates/world/2015_04_05_07_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_05_07_world.sql
diff --git a/sql/updates/world/2015_04_06_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_06_00_world.sql
index 7ba78d72963..7ba78d72963 100644
--- a/sql/updates/world/2015_04_06_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_06_00_world.sql
diff --git a/sql/updates/world/2015_04_06_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_06_01_world.sql
index 2b82c2e3210..2b82c2e3210 100644
--- a/sql/updates/world/2015_04_06_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_06_01_world.sql
diff --git a/sql/updates/world/2015_04_06_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_06_02_world.sql
index 3e04c2250bf..3e04c2250bf 100644
--- a/sql/updates/world/2015_04_06_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_06_02_world.sql
diff --git a/sql/updates/world/2015_04_06_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_06_03_world.sql
index 1241c231ec2..1241c231ec2 100644
--- a/sql/updates/world/2015_04_06_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_06_03_world.sql
diff --git a/sql/updates/world/2015_04_06_04_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_06_04_world.sql
index 0b6adc4f550..0b6adc4f550 100644
--- a/sql/updates/world/2015_04_06_04_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_06_04_world.sql
diff --git a/sql/updates/world/2015_04_06_05_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_06_05_world.sql
index d6e63790a36..d6e63790a36 100644
--- a/sql/updates/world/2015_04_06_05_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_06_05_world.sql
diff --git a/sql/updates/world/2015_04_07_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_07_00_world.sql
index e5cec5e1812..e5cec5e1812 100644
--- a/sql/updates/world/2015_04_07_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_07_00_world.sql
diff --git a/sql/updates/world/2015_04_07_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_07_02_world.sql
index f7df3a0fecc..f7df3a0fecc 100644
--- a/sql/updates/world/2015_04_07_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_07_02_world.sql
diff --git a/sql/updates/world/2015_04_08_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_08_00_world.sql
index f2e13c01bd8..f2e13c01bd8 100644
--- a/sql/updates/world/2015_04_08_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_08_00_world.sql
diff --git a/sql/updates/world/2015_04_08_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_08_01_world.sql
index b96621a1fd7..b96621a1fd7 100644
--- a/sql/updates/world/2015_04_08_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_08_01_world.sql
diff --git a/sql/updates/world/2015_04_09_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_09_00_world.sql
index 75b342ffd00..75b342ffd00 100644
--- a/sql/updates/world/2015_04_09_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_09_00_world.sql
diff --git a/sql/updates/world/2015_04_09_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_09_01_world.sql
index 55da6309cbc..55da6309cbc 100644
--- a/sql/updates/world/2015_04_09_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_09_01_world.sql
diff --git a/sql/updates/world/2015_04_09_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_09_02_world.sql
index e6951cbef50..e6951cbef50 100644
--- a/sql/updates/world/2015_04_09_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_09_02_world.sql
diff --git a/sql/updates/world/2015_04_09_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_09_03_world.sql
index 041c517b861..041c517b861 100644
--- a/sql/updates/world/2015_04_09_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_09_03_world.sql
diff --git a/sql/updates/world/2015_04_10_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_10_00_world.sql
index 9ca98f0f428..9ca98f0f428 100644
--- a/sql/updates/world/2015_04_10_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_10_00_world.sql
diff --git a/sql/updates/world/2015_04_10_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_10_01_world.sql
index 7ef397fd6cc..7ef397fd6cc 100644
--- a/sql/updates/world/2015_04_10_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_10_01_world.sql
diff --git a/sql/updates/world/2015_04_11_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_11_00_world.sql
index b5f9dcc48db..b5f9dcc48db 100644
--- a/sql/updates/world/2015_04_11_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_11_00_world.sql
diff --git a/sql/updates/world/2015_04_11_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_11_01_world.sql
index cf227f03976..cf227f03976 100644
--- a/sql/updates/world/2015_04_11_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_11_01_world.sql
diff --git a/sql/updates/world/2015_04_11_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_11_02_world.sql
index 8e8d850bb17..8e8d850bb17 100644
--- a/sql/updates/world/2015_04_11_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_11_02_world.sql
diff --git a/sql/updates/world/2015_04_11_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_11_03_world.sql
index e2f0d055e3b..e2f0d055e3b 100644
--- a/sql/updates/world/2015_04_11_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_11_03_world.sql
diff --git a/sql/updates/world/2015_04_12_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_12_01_world.sql
index 527d453fe2e..527d453fe2e 100644
--- a/sql/updates/world/2015_04_12_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_12_01_world.sql
diff --git a/sql/updates/world/2015_04_12_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_12_02_world.sql
index 6c885b61505..6c885b61505 100644
--- a/sql/updates/world/2015_04_12_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_12_02_world.sql
diff --git a/sql/updates/world/2015_04_12_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_12_03_world.sql
index 619e48341ac..619e48341ac 100644
--- a/sql/updates/world/2015_04_12_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_12_03_world.sql
diff --git a/sql/updates/world/2015_04_13_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_13_00_world.sql
index 99484e55f87..99484e55f87 100644
--- a/sql/updates/world/2015_04_13_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_13_00_world.sql
diff --git a/sql/updates/world/2015_04_18_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_18_00_world.sql
index 36901a352ea..36901a352ea 100644
--- a/sql/updates/world/2015_04_18_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_18_00_world.sql
diff --git a/sql/updates/world/2015_04_18_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_18_01_world.sql
index 707335c490e..707335c490e 100644
--- a/sql/updates/world/2015_04_18_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_18_01_world.sql
diff --git a/sql/updates/world/2015_04_18_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_18_02_world.sql
index 6a299828e26..6a299828e26 100644
--- a/sql/updates/world/2015_04_18_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_18_02_world.sql
diff --git a/sql/updates/world/2015_04_18_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_18_03_world.sql
index cc6d3d65dea..cc6d3d65dea 100644
--- a/sql/updates/world/2015_04_18_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_18_03_world.sql
diff --git a/sql/updates/world/2015_04_18_04_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_18_04_world.sql
index cad194dafae..cad194dafae 100644
--- a/sql/updates/world/2015_04_18_04_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_18_04_world.sql
diff --git a/sql/updates/world/2015_04_18_05_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_18_05_world.sql
index b61ff01bdfc..b61ff01bdfc 100644
--- a/sql/updates/world/2015_04_18_05_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_18_05_world.sql
diff --git a/sql/updates/world/2015_04_18_05_world_335.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_18_05_world_335.sql
index b81ab654016..b81ab654016 100644
--- a/sql/updates/world/2015_04_18_05_world_335.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_18_05_world_335.sql
diff --git a/sql/updates/world/2015_04_18_06_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_18_06_world.sql
index aa532de444b..aa532de444b 100644
--- a/sql/updates/world/2015_04_18_06_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_18_06_world.sql
diff --git a/sql/updates/world/2015_04_18_07_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_18_07_world.sql
index 4edef92c8ad..4edef92c8ad 100644
--- a/sql/updates/world/2015_04_18_07_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_18_07_world.sql
diff --git a/sql/updates/world/2015_04_18_08_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_18_08_world.sql
index 43fd6f2edb5..43fd6f2edb5 100644
--- a/sql/updates/world/2015_04_18_08_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_18_08_world.sql
diff --git a/sql/updates/world/2015_04_19_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_19_00_world.sql
index 9a11cc65e77..9a11cc65e77 100644
--- a/sql/updates/world/2015_04_19_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_19_00_world.sql
diff --git a/sql/updates/world/2015_04_19_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_19_01_world.sql
index 41f1629fef9..41f1629fef9 100644
--- a/sql/updates/world/2015_04_19_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_19_01_world.sql
diff --git a/sql/updates/world/2015_04_19_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_19_02_world.sql
index c29783ca265..c29783ca265 100644
--- a/sql/updates/world/2015_04_19_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_19_02_world.sql
diff --git a/sql/updates/world/2015_04_23_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_23_00_world.sql
index d89aef32ca2..d89aef32ca2 100644
--- a/sql/updates/world/2015_04_23_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_23_00_world.sql
diff --git a/sql/updates/world/2015_04_23_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_23_01_world.sql
index f9da048bdb6..f9da048bdb6 100644
--- a/sql/updates/world/2015_04_23_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_23_01_world.sql
diff --git a/sql/updates/world/2015_04_24_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_24_00_world.sql
index 17f3c09e31e..17f3c09e31e 100644
--- a/sql/updates/world/2015_04_24_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_24_00_world.sql
diff --git a/sql/updates/world/2015_04_26_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_26_00_world.sql
index 5c13aab122a..5c13aab122a 100644
--- a/sql/updates/world/2015_04_26_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_26_00_world.sql
diff --git a/sql/updates/world/2015_04_26_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_26_01_world.sql
index b7c45c1f987..b7c45c1f987 100644
--- a/sql/updates/world/2015_04_26_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_26_01_world.sql
diff --git a/sql/updates/world/2015_04_26_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_26_02_world.sql
index ea20aae2f7a..ea20aae2f7a 100644
--- a/sql/updates/world/2015_04_26_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_26_02_world.sql
diff --git a/sql/updates/world/2015_04_26_03_world_335.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_26_03_world_335.sql
index 47e7cc7336f..47e7cc7336f 100644
--- a/sql/updates/world/2015_04_26_03_world_335.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_26_03_world_335.sql
diff --git a/sql/updates/world/2015_04_26_04_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_26_04_world.sql
index 2f8698932b5..2f8698932b5 100644
--- a/sql/updates/world/2015_04_26_04_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_26_04_world.sql
diff --git a/sql/updates/world/2015_04_26_05_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_26_05_world.sql
index d870128a55d..d870128a55d 100644
--- a/sql/updates/world/2015_04_26_05_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_26_05_world.sql
diff --git a/sql/updates/world/2015_04_26_06_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_26_06_world.sql
index 014c19cd96e..014c19cd96e 100644
--- a/sql/updates/world/2015_04_26_06_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_26_06_world.sql
diff --git a/sql/updates/world/2015_04_26_07_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_26_07_world.sql
index e23229e7f49..e23229e7f49 100644
--- a/sql/updates/world/2015_04_26_07_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_26_07_world.sql
diff --git a/sql/updates/world/2015_04_26_08_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_26_08_world.sql
index be53b1ebc60..be53b1ebc60 100644
--- a/sql/updates/world/2015_04_26_08_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_26_08_world.sql
diff --git a/sql/updates/world/2015_04_26_09_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_26_09_world.sql
index e450fd5c64e..e450fd5c64e 100644
--- a/sql/updates/world/2015_04_26_09_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_26_09_world.sql
diff --git a/sql/updates/world/2015_04_27_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_27_00_world.sql
index 01db583444e..01db583444e 100644
--- a/sql/updates/world/2015_04_27_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_27_00_world.sql
diff --git a/sql/updates/world/2015_04_27_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_27_01_world.sql
index af4f0fc4faf..af4f0fc4faf 100644
--- a/sql/updates/world/2015_04_27_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_27_01_world.sql
diff --git a/sql/updates/world/2015_04_28_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_28_00_world.sql
index ee651b8473c..ee651b8473c 100644
--- a/sql/updates/world/2015_04_28_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_28_00_world.sql
diff --git a/sql/updates/world/2015_04_28_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_28_01_world.sql
index 3de29012072..3de29012072 100644
--- a/sql/updates/world/2015_04_28_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_28_01_world.sql
diff --git a/sql/updates/world/2015_04_28_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_28_02_world.sql
index c3eebf4ad7a..c3eebf4ad7a 100644
--- a/sql/updates/world/2015_04_28_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_28_02_world.sql
diff --git a/sql/updates/world/2015_04_28_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_28_03_world.sql
index fac605b9f06..fac605b9f06 100644
--- a/sql/updates/world/2015_04_28_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_28_03_world.sql
diff --git a/sql/updates/world/2015_04_29_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_29_00_world.sql
index 14ff30d9e14..14ff30d9e14 100644
--- a/sql/updates/world/2015_04_29_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_29_00_world.sql
diff --git a/sql/updates/world/2015_04_29_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_29_01_world.sql
index e8ec2fb4ae8..e8ec2fb4ae8 100644
--- a/sql/updates/world/2015_04_29_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_04_29_01_world.sql
diff --git a/sql/updates/world/2015_05_01_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_01_00_world.sql
index 779d7368d85..779d7368d85 100644
--- a/sql/updates/world/2015_05_01_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_01_00_world.sql
diff --git a/sql/updates/world/2015_05_01_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_01_01_world.sql
index 8c33ba7714d..8c33ba7714d 100644
--- a/sql/updates/world/2015_05_01_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_01_01_world.sql
diff --git a/sql/updates/world/2015_05_01_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_01_02_world.sql
index 480b3d70009..480b3d70009 100644
--- a/sql/updates/world/2015_05_01_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_01_02_world.sql
diff --git a/sql/updates/world/2015_05_01_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_01_03_world.sql
index dd528f8d704..dd528f8d704 100644
--- a/sql/updates/world/2015_05_01_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_01_03_world.sql
diff --git a/sql/updates/world/2015_05_01_04_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_01_04_world.sql
index a84fde8bb5c..a84fde8bb5c 100644
--- a/sql/updates/world/2015_05_01_04_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_01_04_world.sql
diff --git a/sql/updates/world/2015_05_01_05_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_01_05_world.sql
index a7a4edc673b..a7a4edc673b 100644
--- a/sql/updates/world/2015_05_01_05_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_01_05_world.sql
diff --git a/sql/updates/world/2015_05_01_06_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_01_06_world.sql
index 602e4be700c..602e4be700c 100644
--- a/sql/updates/world/2015_05_01_06_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_01_06_world.sql
diff --git a/sql/updates/world/2015_05_01_07_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_01_07_world.sql
index ac088727f79..ac088727f79 100644
--- a/sql/updates/world/2015_05_01_07_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_01_07_world.sql
diff --git a/sql/updates/world/2015_05_01_08_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_01_08_world.sql
index b41400f7d7c..b41400f7d7c 100644
--- a/sql/updates/world/2015_05_01_08_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_01_08_world.sql
diff --git a/sql/updates/world/2015_05_02_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_02_00_world.sql
index cbcf6bf17e5..cbcf6bf17e5 100644
--- a/sql/updates/world/2015_05_02_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_02_00_world.sql
diff --git a/sql/updates/world/2015_05_02_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_02_01_world.sql
index 62c525b249d..62c525b249d 100644
--- a/sql/updates/world/2015_05_02_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_02_01_world.sql
diff --git a/sql/updates/world/2015_05_04_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_04_00_world.sql
index ca6f5657346..ca6f5657346 100644
--- a/sql/updates/world/2015_05_04_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_04_00_world.sql
diff --git a/sql/updates/world/2015_05_09_00_world_335.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_00_world_335.sql
index 003fa276542..003fa276542 100644
--- a/sql/updates/world/2015_05_09_00_world_335.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_00_world_335.sql
diff --git a/sql/updates/world/2015_05_09_01_world_335.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_01_world_335.sql
index 68f578812f8..68f578812f8 100644
--- a/sql/updates/world/2015_05_09_01_world_335.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_01_world_335.sql
diff --git a/sql/updates/world/2015_05_09_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_02_world.sql
index e2e45095730..e2e45095730 100644
--- a/sql/updates/world/2015_05_09_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_02_world.sql
diff --git a/sql/updates/world/2015_05_09_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_03_world.sql
index 137ae636800..137ae636800 100644
--- a/sql/updates/world/2015_05_09_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_03_world.sql
diff --git a/sql/updates/world/2015_05_09_04_world_335.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_04_world_335.sql
index 814459be957..814459be957 100644
--- a/sql/updates/world/2015_05_09_04_world_335.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_04_world_335.sql
diff --git a/sql/updates/world/2015_05_09_05_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_05_world.sql
index 41576ac375c..41576ac375c 100644
--- a/sql/updates/world/2015_05_09_05_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_05_world.sql
diff --git a/sql/updates/world/2015_05_09_06_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_06_world.sql
index 5038deab480..5038deab480 100644
--- a/sql/updates/world/2015_05_09_06_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_06_world.sql
diff --git a/sql/updates/world/2015_05_09_07_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_07_world.sql
index 459c0c3e1f8..459c0c3e1f8 100644
--- a/sql/updates/world/2015_05_09_07_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_07_world.sql
diff --git a/sql/updates/world/2015_05_09_08_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_08_world.sql
index 4c6ed7ef6ab..4c6ed7ef6ab 100644
--- a/sql/updates/world/2015_05_09_08_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_08_world.sql
diff --git a/sql/updates/world/2015_05_09_09_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_09_world.sql
index 77c55e87dfd..77c55e87dfd 100644
--- a/sql/updates/world/2015_05_09_09_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_09_world.sql
diff --git a/sql/updates/world/2015_05_09_10_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_10_world.sql
index 06b5eb9cd88..06b5eb9cd88 100644
--- a/sql/updates/world/2015_05_09_10_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_10_world.sql
diff --git a/sql/updates/world/2015_05_09_11_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_11_world.sql
index c09cb1c9850..c09cb1c9850 100644
--- a/sql/updates/world/2015_05_09_11_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_11_world.sql
diff --git a/sql/updates/world/2015_05_09_12_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_12_world.sql
index d2e488cc026..d2e488cc026 100644
--- a/sql/updates/world/2015_05_09_12_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_09_12_world.sql
diff --git a/sql/updates/world/2015_05_11_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_11_00_world.sql
index 5e8485202fa..5e8485202fa 100644
--- a/sql/updates/world/2015_05_11_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_11_00_world.sql
diff --git a/sql/updates/world/2015_05_11_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_11_01_world.sql
index d90a5fef88d..d90a5fef88d 100644
--- a/sql/updates/world/2015_05_11_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_11_01_world.sql
diff --git a/sql/updates/world/2015_05_11_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_11_02_world.sql
index 7ec5f4870ce..7ec5f4870ce 100644
--- a/sql/updates/world/2015_05_11_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_11_02_world.sql
diff --git a/sql/updates/world/2015_05_11_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_11_03_world.sql
index b0df32b2a92..b0df32b2a92 100644
--- a/sql/updates/world/2015_05_11_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_11_03_world.sql
diff --git a/sql/updates/world/2015_05_11_04_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_11_04_world.sql
index df59976ae41..df59976ae41 100644
--- a/sql/updates/world/2015_05_11_04_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_11_04_world.sql
diff --git a/sql/updates/world/2015_05_11_05_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_11_05_world.sql
index 82bff616123..82bff616123 100644
--- a/sql/updates/world/2015_05_11_05_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_11_05_world.sql
diff --git a/sql/updates/world/2015_05_11_06_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_11_06_world.sql
index f4a5fe6dd0a..f4a5fe6dd0a 100644
--- a/sql/updates/world/2015_05_11_06_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_11_06_world.sql
diff --git a/sql/updates/world/2015_05_11_07_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_11_07_world.sql
index e35aa8e454b..e35aa8e454b 100644
--- a/sql/updates/world/2015_05_11_07_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_11_07_world.sql
diff --git a/sql/updates/world/2015_05_11_08_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_11_08_world.sql
index d6bcc834780..d6bcc834780 100644
--- a/sql/updates/world/2015_05_11_08_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_11_08_world.sql
diff --git a/sql/updates/world/2015_05_12_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_12_01_world.sql
index 4d9ce60f51c..4d9ce60f51c 100644
--- a/sql/updates/world/2015_05_12_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_12_01_world.sql
diff --git a/sql/updates/world/2015_05_12_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_12_02_world.sql
index 02f95b73494..02f95b73494 100644
--- a/sql/updates/world/2015_05_12_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_12_02_world.sql
diff --git a/sql/updates/world/2015_05_12_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_12_03_world.sql
index 2bcfa9d091b..2bcfa9d091b 100644
--- a/sql/updates/world/2015_05_12_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_12_03_world.sql
diff --git a/sql/updates/world/2015_05_16_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_16_00_world.sql
index 4a77cdd90fe..4a77cdd90fe 100644
--- a/sql/updates/world/2015_05_16_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_16_00_world.sql
diff --git a/sql/updates/world/2015_05_17_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_17_00_world.sql
index 67a5c7635ae..67a5c7635ae 100644
--- a/sql/updates/world/2015_05_17_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_17_00_world.sql
diff --git a/sql/updates/world/2015_05_17_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_17_01_world.sql
index 88e0e0e4f0a..88e0e0e4f0a 100644
--- a/sql/updates/world/2015_05_17_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_17_01_world.sql
diff --git a/sql/updates/world/2015_05_19_00_world_2015_04_05_07.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_19_00_world_2015_04_05_07.sql
index 2e603ee893b..2e603ee893b 100644
--- a/sql/updates/world/2015_05_19_00_world_2015_04_05_07.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_19_00_world_2015_04_05_07.sql
diff --git a/sql/updates/world/2015_05_19_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_19_01_world.sql
index 83dfb06b6fd..83dfb06b6fd 100644
--- a/sql/updates/world/2015_05_19_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_19_01_world.sql
diff --git a/sql/updates/world/2015_05_19_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_19_02_world.sql
index 6194278061e..6194278061e 100644
--- a/sql/updates/world/2015_05_19_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_19_02_world.sql
diff --git a/sql/updates/world/2015_05_20_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_20_00_world.sql
index da59eb2ed07..da59eb2ed07 100644
--- a/sql/updates/world/2015_05_20_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_20_00_world.sql
diff --git a/sql/updates/world/2015_05_20_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_20_01_world.sql
index 332458a4afb..332458a4afb 100644
--- a/sql/updates/world/2015_05_20_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_20_01_world.sql
diff --git a/sql/updates/world/2015_05_20_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_20_02_world.sql
index 0540f17eed6..0540f17eed6 100644
--- a/sql/updates/world/2015_05_20_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_20_02_world.sql
diff --git a/sql/updates/world/2015_05_20_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_20_03_world.sql
index 70abf4ee1af..70abf4ee1af 100644
--- a/sql/updates/world/2015_05_20_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_20_03_world.sql
diff --git a/sql/updates/world/2015_05_20_04_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_20_04_world.sql
index 863f0b86d50..863f0b86d50 100644
--- a/sql/updates/world/2015_05_20_04_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_20_04_world.sql
diff --git a/sql/updates/world/2015_05_20_05_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_20_05_world.sql
index 0e678b593aa..0e678b593aa 100644
--- a/sql/updates/world/2015_05_20_05_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_20_05_world.sql
diff --git a/sql/updates/world/2015_05_20_06_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_20_06_world.sql
index 257ab83e266..257ab83e266 100644
--- a/sql/updates/world/2015_05_20_06_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_20_06_world.sql
diff --git a/sql/updates/world/2015_05_20_07_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_20_07_world.sql
index 21c090c3103..21c090c3103 100644
--- a/sql/updates/world/2015_05_20_07_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_20_07_world.sql
diff --git a/sql/updates/world/2015_05_20_08_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_20_08_world.sql
index 42ea7da2159..42ea7da2159 100644
--- a/sql/updates/world/2015_05_20_08_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_20_08_world.sql
diff --git a/sql/updates/world/2015_05_20_09_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_20_09_world.sql
index bef8f966737..bef8f966737 100644
--- a/sql/updates/world/2015_05_20_09_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_20_09_world.sql
diff --git a/sql/updates/world/2015_05_21_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_21_00_world.sql
index c076920bbba..c076920bbba 100644
--- a/sql/updates/world/2015_05_21_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_21_00_world.sql
diff --git a/sql/updates/world/2015_05_21_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_21_01_world.sql
index 9468a3d8073..9468a3d8073 100644
--- a/sql/updates/world/2015_05_21_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_21_01_world.sql
diff --git a/sql/updates/world/2015_05_21_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_21_02_world.sql
index 6dd265a1a3f..6dd265a1a3f 100644
--- a/sql/updates/world/2015_05_21_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_21_02_world.sql
diff --git a/sql/updates/world/2015_05_21_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_21_03_world.sql
index 70fb2687b8c..70fb2687b8c 100644
--- a/sql/updates/world/2015_05_21_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_21_03_world.sql
diff --git a/sql/updates/world/2015_05_22_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_00_world.sql
index 2949d0eca4a..2949d0eca4a 100644
--- a/sql/updates/world/2015_05_22_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_00_world.sql
diff --git a/sql/updates/world/2015_05_22_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_01_world.sql
index 676fa999ebb..676fa999ebb 100644
--- a/sql/updates/world/2015_05_22_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_01_world.sql
diff --git a/sql/updates/world/2015_05_22_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_02_world.sql
index f4322c6c2ba..f4322c6c2ba 100644
--- a/sql/updates/world/2015_05_22_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_02_world.sql
diff --git a/sql/updates/world/2015_05_22_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_03_world.sql
index 31ba798f2da..31ba798f2da 100644
--- a/sql/updates/world/2015_05_22_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_03_world.sql
diff --git a/sql/updates/world/2015_05_22_04_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_04_world.sql
index f99479a6042..f99479a6042 100644
--- a/sql/updates/world/2015_05_22_04_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_04_world.sql
diff --git a/sql/updates/world/2015_05_22_05_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_05_world.sql
index 076c8fe22de..076c8fe22de 100644
--- a/sql/updates/world/2015_05_22_05_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_05_world.sql
diff --git a/sql/updates/world/2015_05_22_06_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_06_world.sql
index 939ee2dbc7a..939ee2dbc7a 100644
--- a/sql/updates/world/2015_05_22_06_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_06_world.sql
diff --git a/sql/updates/world/2015_05_22_07_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_07_world.sql
index fbc99492240..fbc99492240 100644
--- a/sql/updates/world/2015_05_22_07_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_07_world.sql
diff --git a/sql/updates/world/2015_05_22_08_world_335.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_08_world_335.sql
index 9cdb7edf295..9cdb7edf295 100644
--- a/sql/updates/world/2015_05_22_08_world_335.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_08_world_335.sql
diff --git a/sql/updates/world/2015_05_22_09_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_09_world.sql
index e24e207cd3c..e24e207cd3c 100644
--- a/sql/updates/world/2015_05_22_09_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_09_world.sql
diff --git a/sql/updates/world/2015_05_22_10_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_10_world.sql
index a87647f1cd7..a87647f1cd7 100644
--- a/sql/updates/world/2015_05_22_10_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_10_world.sql
diff --git a/sql/updates/world/2015_05_22_11_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_11_world.sql
index 01122a6bc57..01122a6bc57 100644
--- a/sql/updates/world/2015_05_22_11_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_11_world.sql
diff --git a/sql/updates/world/2015_05_22_12_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_12_world.sql
index 84b5918e7f4..84b5918e7f4 100644
--- a/sql/updates/world/2015_05_22_12_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_12_world.sql
diff --git a/sql/updates/world/2015_05_22_13_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_13_world.sql
index db90e99cf4d..db90e99cf4d 100644
--- a/sql/updates/world/2015_05_22_13_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_13_world.sql
diff --git a/sql/updates/world/2015_05_22_14_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_14_world.sql
index 43bbacd2d1a..43bbacd2d1a 100644
--- a/sql/updates/world/2015_05_22_14_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_14_world.sql
diff --git a/sql/updates/world/2015_05_22_15_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_15_world.sql
index c2a90abf892..c2a90abf892 100644
--- a/sql/updates/world/2015_05_22_15_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_22_15_world.sql
diff --git a/sql/updates/world/2015_05_23_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_23_00_world.sql
index 914b721b2ed..914b721b2ed 100644
--- a/sql/updates/world/2015_05_23_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_23_00_world.sql
diff --git a/sql/updates/world/2015_05_23_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_23_01_world.sql
index 44c17b81f48..44c17b81f48 100644
--- a/sql/updates/world/2015_05_23_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_23_01_world.sql
diff --git a/sql/updates/world/2015_05_23_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_23_02_world.sql
index b00fa1c2d86..b00fa1c2d86 100644
--- a/sql/updates/world/2015_05_23_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_23_02_world.sql
diff --git a/sql/updates/world/2015_05_23_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_23_03_world.sql
index ace8253bbde..ace8253bbde 100644
--- a/sql/updates/world/2015_05_23_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_23_03_world.sql
diff --git a/sql/updates/world/2015_05_24_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_24_00_world.sql
index 946c20339cb..946c20339cb 100644
--- a/sql/updates/world/2015_05_24_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_24_00_world.sql
diff --git a/sql/updates/world/2015_05_24_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_24_01_world.sql
index b8e343d9840..b8e343d9840 100644
--- a/sql/updates/world/2015_05_24_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_24_01_world.sql
diff --git a/sql/updates/world/2015_05_24_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_24_02_world.sql
index 7f8cd3a457f..7f8cd3a457f 100644
--- a/sql/updates/world/2015_05_24_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_24_02_world.sql
diff --git a/sql/updates/world/2015_05_24_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_24_03_world.sql
index e4283fae295..e4283fae295 100644
--- a/sql/updates/world/2015_05_24_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_24_03_world.sql
diff --git a/sql/updates/world/2015_05_24_04_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_24_04_world.sql
index 70cc65fb490..70cc65fb490 100644
--- a/sql/updates/world/2015_05_24_04_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_24_04_world.sql
diff --git a/sql/updates/world/2015_05_24_05_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_24_05_world.sql
index 2b3641b257c..2b3641b257c 100644
--- a/sql/updates/world/2015_05_24_05_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_24_05_world.sql
diff --git a/sql/updates/world/2015_05_24_06_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_24_06_world.sql
index 756b2d569cf..756b2d569cf 100644
--- a/sql/updates/world/2015_05_24_06_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_24_06_world.sql
diff --git a/sql/updates/world/2015_05_24_07_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_24_07_world.sql
index af7e82b8087..af7e82b8087 100644
--- a/sql/updates/world/2015_05_24_07_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_24_07_world.sql
diff --git a/sql/updates/world/2015_05_24_08_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_24_08_world.sql
index d8bc19aaffb..d8bc19aaffb 100644
--- a/sql/updates/world/2015_05_24_08_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_24_08_world.sql
diff --git a/sql/updates/world/2015_05_25_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_25_00_world.sql
index 4b1cc48da5a..4b1cc48da5a 100644
--- a/sql/updates/world/2015_05_25_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_25_00_world.sql
diff --git a/sql/updates/world/2015_05_26_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_26_00_world.sql
index cc1a6810764..cc1a6810764 100644
--- a/sql/updates/world/2015_05_26_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_26_00_world.sql
diff --git a/sql/updates/world/2015_05_26_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_26_01_world.sql
index b1dd41196a6..b1dd41196a6 100644
--- a/sql/updates/world/2015_05_26_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_26_01_world.sql
diff --git a/sql/updates/world/2015_05_26_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_26_02_world.sql
index d56e45a1514..d56e45a1514 100644
--- a/sql/updates/world/2015_05_26_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_26_02_world.sql
diff --git a/sql/updates/world/2015_05_26_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_26_03_world.sql
index 30b5103caa8..30b5103caa8 100644
--- a/sql/updates/world/2015_05_26_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_26_03_world.sql
diff --git a/sql/updates/world/2015_05_26_04_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_26_04_world.sql
index 39728f515ee..39728f515ee 100644
--- a/sql/updates/world/2015_05_26_04_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_26_04_world.sql
diff --git a/sql/updates/world/2015_05_26_05_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_26_05_world.sql
index d7ef0e17204..d7ef0e17204 100644
--- a/sql/updates/world/2015_05_26_05_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_26_05_world.sql
diff --git a/sql/updates/world/2015_05_26_06_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_26_06_world.sql
index 09010f2475b..09010f2475b 100644
--- a/sql/updates/world/2015_05_26_06_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_26_06_world.sql
diff --git a/sql/updates/world/2015_05_27_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_27_00_world.sql
index 8f0f712ea27..8f0f712ea27 100644
--- a/sql/updates/world/2015_05_27_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_27_00_world.sql
diff --git a/sql/updates/world/2015_05_27_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_27_01_world.sql
index 0c706304d60..0c706304d60 100644
--- a/sql/updates/world/2015_05_27_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_27_01_world.sql
diff --git a/sql/updates/world/2015_05_28_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_28_00_world.sql
index e8bdb13ddb5..e8bdb13ddb5 100644
--- a/sql/updates/world/2015_05_28_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_28_00_world.sql
diff --git a/sql/updates/world/2015_05_28_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_28_01_world.sql
index 1199e250c47..1199e250c47 100644
--- a/sql/updates/world/2015_05_28_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_28_01_world.sql
diff --git a/sql/updates/world/2015_05_28_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_28_02_world.sql
index 1376088c3e1..1376088c3e1 100644
--- a/sql/updates/world/2015_05_28_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_28_02_world.sql
diff --git a/sql/updates/world/2015_05_29_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_29_00_world.sql
index 0f3c69c0b4d..0f3c69c0b4d 100644
--- a/sql/updates/world/2015_05_29_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_29_00_world.sql
diff --git a/sql/updates/world/2015_05_29_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_29_01_world.sql
index ce03049c9a9..ce03049c9a9 100644
--- a/sql/updates/world/2015_05_29_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_29_01_world.sql
diff --git a/sql/updates/world/2015_05_30_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_30_00_world.sql
index df213688ba7..df213688ba7 100644
--- a/sql/updates/world/2015_05_30_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_30_00_world.sql
diff --git a/sql/updates/world/2015_05_30_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_30_01_world.sql
index 5a3a2208d7d..5a3a2208d7d 100644
--- a/sql/updates/world/2015_05_30_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_30_01_world.sql
diff --git a/sql/updates/world/2015_05_30_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_30_02_world.sql
index 0dd7eb3bcab..0dd7eb3bcab 100644
--- a/sql/updates/world/2015_05_30_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_30_02_world.sql
diff --git a/sql/updates/world/2015_05_30_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_30_03_world.sql
index 634705b846f..634705b846f 100644
--- a/sql/updates/world/2015_05_30_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_30_03_world.sql
diff --git a/sql/updates/world/2015_05_31_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_31_00_world.sql
index 090cff4b41b..090cff4b41b 100644
--- a/sql/updates/world/2015_05_31_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_31_00_world.sql
diff --git a/sql/updates/world/2015_05_31_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_31_01_world.sql
index 151c7865bbc..151c7865bbc 100644
--- a/sql/updates/world/2015_05_31_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_31_01_world.sql
diff --git a/sql/updates/world/2015_05_31_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_31_02_world.sql
index fdc14ab4b6f..fdc14ab4b6f 100644
--- a/sql/updates/world/2015_05_31_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_31_02_world.sql
diff --git a/sql/updates/world/2015_05_31_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_31_03_world.sql
index e786e71191c..e786e71191c 100644
--- a/sql/updates/world/2015_05_31_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_31_03_world.sql
diff --git a/sql/updates/world/2015_05_31_04_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_31_04_world.sql
index 94785d6d356..94785d6d356 100644
--- a/sql/updates/world/2015_05_31_04_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_31_04_world.sql
diff --git a/sql/updates/world/2015_05_31_05_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_31_05_world.sql
index bba678d60d6..bba678d60d6 100644
--- a/sql/updates/world/2015_05_31_05_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_05_31_05_world.sql
diff --git a/sql/updates/world/2015_06_01_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_01_00_world.sql
index 8ba1d65ec52..8ba1d65ec52 100644
--- a/sql/updates/world/2015_06_01_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_01_00_world.sql
diff --git a/sql/updates/world/2015_06_01_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_01_01_world.sql
index 6edab0cd995..6edab0cd995 100644
--- a/sql/updates/world/2015_06_01_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_01_01_world.sql
diff --git a/sql/updates/world/2015_06_02_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_02_00_world.sql
index 671a776367f..671a776367f 100644
--- a/sql/updates/world/2015_06_02_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_02_00_world.sql
diff --git a/sql/updates/world/2015_06_03_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_03_00_world.sql
index 31461906117..31461906117 100644
--- a/sql/updates/world/2015_06_03_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_03_00_world.sql
diff --git a/sql/updates/world/2015_06_03_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_03_01_world.sql
index 6315df93149..6315df93149 100644
--- a/sql/updates/world/2015_06_03_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_03_01_world.sql
diff --git a/sql/updates/world/2015_06_04_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_04_00_world.sql
index da4814af332..da4814af332 100644
--- a/sql/updates/world/2015_06_04_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_04_00_world.sql
diff --git a/sql/updates/world/2015_06_04_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_04_01_world.sql
index e70f226f5f4..e70f226f5f4 100644
--- a/sql/updates/world/2015_06_04_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_04_01_world.sql
diff --git a/sql/updates/world/2015_06_06_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_00_world.sql
index ba065a944bf..ba065a944bf 100644
--- a/sql/updates/world/2015_06_06_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_00_world.sql
diff --git a/sql/updates/world/2015_06_06_01_world_335.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_01_world_335.sql
index b8dc057cf34..b8dc057cf34 100644
--- a/sql/updates/world/2015_06_06_01_world_335.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_01_world_335.sql
diff --git a/sql/updates/world/2015_06_06_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_02_world.sql
index 509fe6a33b0..509fe6a33b0 100644
--- a/sql/updates/world/2015_06_06_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_02_world.sql
diff --git a/sql/updates/world/2015_06_06_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_03_world.sql
index 641217fffc0..641217fffc0 100644
--- a/sql/updates/world/2015_06_06_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_03_world.sql
diff --git a/sql/updates/world/2015_06_06_04_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_04_world.sql
index 8cb198d4c6f..8cb198d4c6f 100644
--- a/sql/updates/world/2015_06_06_04_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_04_world.sql
diff --git a/sql/updates/world/2015_06_06_05_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_05_world.sql
index 463b5c8e76a..463b5c8e76a 100644
--- a/sql/updates/world/2015_06_06_05_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_05_world.sql
diff --git a/sql/updates/world/2015_06_06_06_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_06_world.sql
index 374ace5e9f6..374ace5e9f6 100644
--- a/sql/updates/world/2015_06_06_06_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_06_world.sql
diff --git a/sql/updates/world/2015_06_06_07_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_07_world.sql
index c5132143a5b..c5132143a5b 100644
--- a/sql/updates/world/2015_06_06_07_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_07_world.sql
diff --git a/sql/updates/world/2015_06_06_08_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_08_world.sql
index 6e11c906871..6e11c906871 100644
--- a/sql/updates/world/2015_06_06_08_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_08_world.sql
diff --git a/sql/updates/world/2015_06_06_09_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_09_world.sql
index 388541fa522..388541fa522 100644
--- a/sql/updates/world/2015_06_06_09_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_09_world.sql
diff --git a/sql/updates/world/2015_06_06_10_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_10_world.sql
index c1740acf6b4..c1740acf6b4 100644
--- a/sql/updates/world/2015_06_06_10_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_10_world.sql
diff --git a/sql/updates/world/2015_06_06_11_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_11_world.sql
index 5edc822af3c..5edc822af3c 100644
--- a/sql/updates/world/2015_06_06_11_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_11_world.sql
diff --git a/sql/updates/world/2015_06_06_12_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_12_world.sql
index 06ff734a74c..06ff734a74c 100644
--- a/sql/updates/world/2015_06_06_12_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_12_world.sql
diff --git a/sql/updates/world/2015_06_06_13_world_335.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_13_world_335.sql
index 01801523945..01801523945 100644
--- a/sql/updates/world/2015_06_06_13_world_335.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_06_13_world_335.sql
diff --git a/sql/updates/world/2015_06_08_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_08_00_world.sql
index c375b89aa72..c375b89aa72 100644
--- a/sql/updates/world/2015_06_08_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_08_00_world.sql
diff --git a/sql/updates/world/2015_06_11_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_11_00_world.sql
index 2e5e4786c13..2e5e4786c13 100644
--- a/sql/updates/world/2015_06_11_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_11_00_world.sql
diff --git a/sql/updates/world/2015_06_12_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_12_00_world.sql
index 2ed3766deae..2ed3766deae 100644
--- a/sql/updates/world/2015_06_12_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_12_00_world.sql
diff --git a/sql/updates/world/2015_06_13_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_13_00_world.sql
index b360ce4e3bc..b360ce4e3bc 100644
--- a/sql/updates/world/2015_06_13_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_13_00_world.sql
diff --git a/sql/updates/world/2015_06_13_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_13_01_world.sql
index d0833aca0c2..d0833aca0c2 100644
--- a/sql/updates/world/2015_06_13_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_13_01_world.sql
diff --git a/sql/updates/world/2015_06_14_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_14_00_world.sql
index 07a6dd72f35..07a6dd72f35 100644
--- a/sql/updates/world/2015_06_14_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_14_00_world.sql
diff --git a/sql/updates/world/2015_06_21_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_21_00_world.sql
index 709f78fca92..709f78fca92 100644
--- a/sql/updates/world/2015_06_21_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_21_00_world.sql
diff --git a/sql/updates/world/2015_06_23_00_world_335.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_23_00_world_335.sql
index fd7132491b0..fd7132491b0 100644
--- a/sql/updates/world/2015_06_23_00_world_335.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_23_00_world_335.sql
diff --git a/sql/updates/world/2015_06_23_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_23_01_world.sql
index 2e42d16cd7b..2e42d16cd7b 100644
--- a/sql/updates/world/2015_06_23_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_23_01_world.sql
diff --git a/sql/updates/world/2015_06_23_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_23_02_world.sql
index adcbb40f7d1..adcbb40f7d1 100644
--- a/sql/updates/world/2015_06_23_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_23_02_world.sql
diff --git a/sql/updates/world/2015_06_25_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_25_00_world.sql
index 56e8aa61c9b..56e8aa61c9b 100644
--- a/sql/updates/world/2015_06_25_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_25_00_world.sql
diff --git a/sql/updates/world/2015_06_26_00_world_2015_06_13_00.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_26_00_world_2015_06_13_00.sql
index 1df4461fe38..1df4461fe38 100644
--- a/sql/updates/world/2015_06_26_00_world_2015_06_13_00.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_26_00_world_2015_06_13_00.sql
diff --git a/sql/updates/world/2015_06_26_01_world_2015_05_15_00.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_26_01_world_2015_05_15_00.sql
index 06e2bdda370..06e2bdda370 100644
--- a/sql/updates/world/2015_06_26_01_world_2015_05_15_00.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_26_01_world_2015_05_15_00.sql
diff --git a/sql/updates/world/2015_06_26_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_26_02_world.sql
index 2e4c22ab110..2e4c22ab110 100644
--- a/sql/updates/world/2015_06_26_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_26_02_world.sql
diff --git a/sql/updates/world/2015_06_28_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_28_00_world.sql
index 3991d639615..3991d639615 100644
--- a/sql/updates/world/2015_06_28_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_28_00_world.sql
diff --git a/sql/updates/world/2015_06_28_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_28_01_world.sql
index 4f591bc293c..4f591bc293c 100644
--- a/sql/updates/world/2015_06_28_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_28_01_world.sql
diff --git a/sql/updates/world/2015_06_28_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_28_02_world.sql
index 0b376442393..0b376442393 100644
--- a/sql/updates/world/2015_06_28_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_28_02_world.sql
diff --git a/sql/updates/world/2015_06_28_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_28_03_world.sql
index ff6dfc6330f..ff6dfc6330f 100644
--- a/sql/updates/world/2015_06_28_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_28_03_world.sql
diff --git a/sql/updates/world/2015_06_28_04_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_28_04_world.sql
index 9e96b40fa0b..9e96b40fa0b 100644
--- a/sql/updates/world/2015_06_28_04_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_28_04_world.sql
diff --git a/sql/updates/world/2015_06_28_05_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_28_05_world.sql
index b01701a74bd..b01701a74bd 100644
--- a/sql/updates/world/2015_06_28_05_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_28_05_world.sql
diff --git a/sql/updates/world/2015_06_28_06_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_28_06_world.sql
index f8937aaf081..f8937aaf081 100644
--- a/sql/updates/world/2015_06_28_06_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_28_06_world.sql
diff --git a/sql/updates/world/2015_06_28_07_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_28_07_world.sql
index 20bddf5597c..20bddf5597c 100644
--- a/sql/updates/world/2015_06_28_07_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_28_07_world.sql
diff --git a/sql/updates/world/2015_06_29_00_world_335.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_29_00_world_335.sql
index c515264e0a7..c515264e0a7 100644
--- a/sql/updates/world/2015_06_29_00_world_335.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_06_29_00_world_335.sql
diff --git a/sql/updates/world/2015_07_01_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_01_00_world.sql
index 1ab4caae8c9..1ab4caae8c9 100644
--- a/sql/updates/world/2015_07_01_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_01_00_world.sql
diff --git a/sql/updates/world/2015_07_01_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_01_01_world.sql
index 483f3539f29..483f3539f29 100644
--- a/sql/updates/world/2015_07_01_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_01_01_world.sql
diff --git a/sql/updates/world/2015_07_01_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_01_02_world.sql
index 59238432ba9..59238432ba9 100644
--- a/sql/updates/world/2015_07_01_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_01_02_world.sql
diff --git a/sql/updates/world/2015_07_01_03_world_335.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_01_03_world_335.sql
index 4fde11a51aa..4fde11a51aa 100644
--- a/sql/updates/world/2015_07_01_03_world_335.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_01_03_world_335.sql
diff --git a/sql/updates/world/2015_07_06_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_06_00_world.sql
index 28d6b45e019..28d6b45e019 100644
--- a/sql/updates/world/2015_07_06_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_06_00_world.sql
diff --git a/sql/updates/world/2015_07_11_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_11_00_world.sql
index 968be928b13..968be928b13 100644
--- a/sql/updates/world/2015_07_11_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_11_00_world.sql
diff --git a/sql/updates/world/2015_07_12_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_00_world.sql
index 6b39023b2d5..6b39023b2d5 100644
--- a/sql/updates/world/2015_07_12_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_00_world.sql
diff --git a/sql/updates/world/2015_07_12_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_01_world.sql
index 26a5a94bd83..26a5a94bd83 100644
--- a/sql/updates/world/2015_07_12_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_01_world.sql
diff --git a/sql/updates/world/2015_07_12_02_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_02_world.sql
index 1bd9a94034a..1bd9a94034a 100644
--- a/sql/updates/world/2015_07_12_02_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_02_world.sql
diff --git a/sql/updates/world/2015_07_12_03_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_03_world.sql
index 7051069c121..7051069c121 100644
--- a/sql/updates/world/2015_07_12_03_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_03_world.sql
diff --git a/sql/updates/world/2015_07_12_04_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_04_world.sql
index 92d33488e9a..92d33488e9a 100644
--- a/sql/updates/world/2015_07_12_04_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_04_world.sql
diff --git a/sql/updates/world/2015_07_12_05_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_05_world.sql
index a2fb34e9d7d..a2fb34e9d7d 100644
--- a/sql/updates/world/2015_07_12_05_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_05_world.sql
diff --git a/sql/updates/world/2015_07_12_06_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_06_world.sql
index 5a0db2b9ec5..5a0db2b9ec5 100644
--- a/sql/updates/world/2015_07_12_06_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_06_world.sql
diff --git a/sql/updates/world/2015_07_12_07_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_07_world.sql
index 0a74a4c018d..0a74a4c018d 100644
--- a/sql/updates/world/2015_07_12_07_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_07_world.sql
diff --git a/sql/updates/world/2015_07_12_08_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_08_world.sql
index c30dfc9c375..c30dfc9c375 100644
--- a/sql/updates/world/2015_07_12_08_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_12_08_world.sql
diff --git a/sql/updates/world/2015_07_13_00_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_13_00_world.sql
index 384699449f4..384699449f4 100644
--- a/sql/updates/world/2015_07_13_00_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_13_00_world.sql
diff --git a/sql/updates/world/2015_07_13_01_world.sql b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_13_01_world.sql
index f2d691b3b82..f2d691b3b82 100644
--- a/sql/updates/world/2015_07_13_01_world.sql
+++ b/sql/old/3.3.5a/world/58_2015_03_21/2015_07_13_01_world.sql
diff --git a/sql/updates/auth/dummy b/sql/updates/auth/dummy
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/sql/updates/auth/dummy
diff --git a/sql/updates/characters/dummy b/sql/updates/characters/dummy
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/sql/updates/characters/dummy
diff --git a/sql/updates/world/2015_07_14_00_world.sql b/sql/updates/world/2015_07_14_00_world.sql
new file mode 100644
index 00000000000..8a4b9bed801
--- /dev/null
+++ b/sql/updates/world/2015_07_14_00_world.sql
@@ -0,0 +1 @@
+UPDATE `version` SET `db_version`='TDB 335.59', `cache_id`=59 LIMIT 1;