329 files changed, 502 insertions, 14 deletions

diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
index 35af91a9e5b..ca33fc2cdbe 100644
--- a/sql/base/auth_database.sql
+++ b/sql/base/auth_database.sql
@@ -127,11 +127,11 @@ CREATE TABLE `account_last_played_character` (
   `accountId` int(10) unsigned NOT NULL,
   `region` tinyint(3) unsigned NOT NULL,
   `battlegroup` tinyint(3) unsigned NOT NULL,
-  `realmId` int(10) unsigned,
-  `characterName` varchar(12),
-  `characterGUID` bigint(20) unsigned,
-  `lastPlayedTime` int(10) unsigned,
-  PRIMARY KEY(`accountId`,`region`,`battlegroup`)
+  `realmId` int(10) unsigned DEFAULT NULL,
+  `characterName` varchar(12) DEFAULT NULL,
+  `characterGUID` bigint(20) unsigned DEFAULT NULL,
+  `lastPlayedTime` int(10) unsigned DEFAULT NULL,
+  PRIMARY KEY (`accountId`,`region`,`battlegroup`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -747,4 +747,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2015-11-08  1:52:10
+-- Dump completed on 2016-04-11  2:02:45
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
index 4ab419be76f..447f451d9c7 100644
--- a/sql/base/characters_database.sql
+++ b/sql/base/characters_database.sql
@@ -979,7 +979,7 @@ CREATE TABLE `character_instance` (
   `guid` bigint(20) unsigned NOT NULL DEFAULT '0',
   `instance` int(10) unsigned NOT NULL DEFAULT '0',
   `permanent` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `extendState` TINYINT(2) UNSIGNED NOT NULL DEFAULT '1',
+  `extendState` tinyint(2) unsigned NOT NULL DEFAULT '1',
   PRIMARY KEY (`guid`,`instance`),
   KEY `instance` (`instance`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@@ -3168,4 +3168,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2015-11-08  1:52:10
+-- Dump completed on 2016-04-11  2:02:46
diff --git a/sql/base/dev/hotfixes_database.sql b/sql/base/dev/hotfixes_database.sql
index 310573098ef..2e9d18d05ed 100644
--- a/sql/base/dev/hotfixes_database.sql
+++ b/sql/base/dev/hotfixes_database.sql
@@ -16,20 +16,52 @@
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 
 --
--- Table structure for table `area_group`
+-- Table structure for table `achievement`
 --
 
-DROP TABLE IF EXISTS `area_group`;
+DROP TABLE IF EXISTS `achievement`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `area_group` (
+CREATE TABLE `achievement` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Faction` int(11) NOT NULL DEFAULT '0',
+  `MapID` int(11) NOT NULL DEFAULT '0',
+  `Supercedes` int(10) unsigned NOT NULL DEFAULT '0',
+  `Title` text,
+  `Description` text,
+  `Category` int(10) unsigned NOT NULL DEFAULT '0',
+  `Points` int(10) unsigned NOT NULL DEFAULT '0',
+  `UIOrder` int(10) unsigned NOT NULL DEFAULT '0',
+  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
+  `IconID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Reward` text,
+  `MinimumCriteria` int(10) unsigned NOT NULL DEFAULT '0',
+  `SharesCriteria` int(10) unsigned NOT NULL DEFAULT '0',
+  `CriteriaTree` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `achievement_locale`
+--
+
+DROP TABLE IF EXISTS `achievement_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `achievement_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `Title_lang` text,
+  `Description_lang` text,
+  `Reward_lang` text,
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`locale`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `area_group_member`
 --
 
@@ -164,6 +196,39 @@ CREATE TABLE `barber_shop_style_locale` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `battle_pet_breed_quality`
+--
+
+DROP TABLE IF EXISTS `battle_pet_breed_quality`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `battle_pet_breed_quality` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Quality` int(10) unsigned NOT NULL DEFAULT '0',
+  `Modifier` float NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `battle_pet_breed_state`
+--
+
+DROP TABLE IF EXISTS `battle_pet_breed_state`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `battle_pet_breed_state` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `BreedID` int(10) unsigned NOT NULL DEFAULT '0',
+  `State` int(10) unsigned NOT NULL DEFAULT '0',
+  `Value` int(11) NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `battle_pet_species`
 --
 
@@ -186,6 +251,40 @@ CREATE TABLE `battle_pet_species` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `battle_pet_species_locale`
+--
+
+DROP TABLE IF EXISTS `battle_pet_species_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `battle_pet_species_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `SourceText` text,
+  `Description` text,
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`locale`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `battle_pet_species_state`
+--
+
+DROP TABLE IF EXISTS `battle_pet_species_state`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `battle_pet_species_state` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpeciesID` int(10) unsigned NOT NULL DEFAULT '0',
+  `State` int(10) unsigned NOT NULL DEFAULT '0',
+  `Value` int(11) NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `broadcast_text`
 --
 
@@ -504,6 +603,68 @@ CREATE TABLE `creature_type_locale` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `criteria`
+--
+
+DROP TABLE IF EXISTS `criteria`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `criteria` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Type` int(10) unsigned NOT NULL DEFAULT '0',
+  `Asset` int(10) unsigned NOT NULL DEFAULT '0',
+  `StartEvent` int(10) unsigned NOT NULL DEFAULT '0',
+  `StartAsset` int(10) unsigned NOT NULL DEFAULT '0',
+  `StartTimer` int(10) unsigned NOT NULL DEFAULT '0',
+  `FailEvent` int(10) unsigned NOT NULL DEFAULT '0',
+  `FailAsset` int(10) unsigned NOT NULL DEFAULT '0',
+  `ModifierTreeId` int(10) unsigned NOT NULL DEFAULT '0',
+  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
+  `EligibilityWorldStateID` int(10) unsigned NOT NULL DEFAULT '0',
+  `EligibilityWorldStateValue` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `criteria_tree`
+--
+
+DROP TABLE IF EXISTS `criteria_tree`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `criteria_tree` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `CriteriaID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Amount` bigint(20) unsigned NOT NULL DEFAULT '0',
+  `Operator` int(10) unsigned NOT NULL DEFAULT '0',
+  `Parent` int(10) unsigned NOT NULL DEFAULT '0',
+  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
+  `Description` text,
+  `OrderIndex` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `criteria_tree_locale`
+--
+
+DROP TABLE IF EXISTS `criteria_tree_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `criteria_tree_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `Description_lang` text,
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`locale`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `currency_types`
 --
 
@@ -1086,6 +1247,47 @@ CREATE TABLE `guild_perk_spells` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `heirloom`
+--
+
+DROP TABLE IF EXISTS `heirloom`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `heirloom` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
+  `SourceText` text,
+  `Source` int(10) unsigned NOT NULL DEFAULT '0',
+  `OldItem1` int(10) unsigned NOT NULL DEFAULT '0',
+  `OldItem2` int(10) unsigned NOT NULL DEFAULT '0',
+  `NextDifficultyItemID` int(10) unsigned NOT NULL DEFAULT '0',
+  `UpgradeItemID1` int(10) unsigned NOT NULL DEFAULT '0',
+  `UpgradeItemID2` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemBonusListID1` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemBonusListID2` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `heirloom_locale`
+--
+
+DROP TABLE IF EXISTS `heirloom_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `heirloom_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `SourceText_lang` text,
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`locale`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `holidays`
 --
 
@@ -1769,6 +1971,19 @@ CREATE TABLE `item_spec_override` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `item_to_battle_pet_species`
+--
+
+DROP TABLE IF EXISTS `item_to_battle_pet_species`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `item_to_battle_pet_species` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `BattlePetSpeciesID` int(10) unsigned NOT NULL DEFAULT '0'
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `item_x_bonus_tree`
 --
 
@@ -1862,6 +2077,26 @@ CREATE TABLE `mail_template_locale` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `modifier_tree`
+--
+
+DROP TABLE IF EXISTS `modifier_tree`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `modifier_tree` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Type` int(10) unsigned NOT NULL DEFAULT '0',
+  `Asset1` int(10) unsigned NOT NULL DEFAULT '0',
+  `Asset2` int(10) unsigned NOT NULL DEFAULT '0',
+  `Operator` int(10) unsigned NOT NULL DEFAULT '0',
+  `Amount` int(10) unsigned NOT NULL DEFAULT '0',
+  `Parent` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `mount`
 --
 
@@ -1974,6 +2209,53 @@ CREATE TABLE `name_gen_locale` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `names_profanity`
+--
+
+DROP TABLE IF EXISTS `names_profanity`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `names_profanity` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Name` text,
+  `Language` int(10) NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `names_reserved`
+--
+
+DROP TABLE IF EXISTS `names_reserved`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `names_reserved` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Name` text,
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `names_reserved_locale`
+--
+
+DROP TABLE IF EXISTS `names_reserved_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `names_reserved_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Name` text,
+  `LocaleMask` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `override_spell_data`
 --
 
@@ -2016,6 +2298,172 @@ CREATE TABLE `phase_group` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `player_condition`
+--
+
+DROP TABLE IF EXISTS `player_condition`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `player_condition` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
+  `MinLevel` int(10) unsigned NOT NULL DEFAULT '0',
+  `MaxLevel` int(10) unsigned NOT NULL DEFAULT '0',
+  `RaceMask` int(10) unsigned NOT NULL DEFAULT '0',
+  `ClassMask` int(10) unsigned NOT NULL DEFAULT '0',
+  `Gender` int(11) NOT NULL DEFAULT '0',
+  `NativeGender` int(11) NOT NULL DEFAULT '0',
+  `SkillID1` int(10) unsigned NOT NULL DEFAULT '0',
+  `SkillID2` int(10) unsigned NOT NULL DEFAULT '0',
+  `SkillID3` int(10) unsigned NOT NULL DEFAULT '0',
+  `SkillID4` int(10) unsigned NOT NULL DEFAULT '0',
+  `MinSkill1` int(11) NOT NULL DEFAULT '0',
+  `MinSkill2` int(11) NOT NULL DEFAULT '0',
+  `MinSkill3` int(11) NOT NULL DEFAULT '0',
+  `MinSkill4` int(11) NOT NULL DEFAULT '0',
+  `MaxSkill1` int(11) NOT NULL DEFAULT '0',
+  `MaxSkill2` int(11) NOT NULL DEFAULT '0',
+  `MaxSkill3` int(11) NOT NULL DEFAULT '0',
+  `MaxSkill4` int(11) NOT NULL DEFAULT '0',
+  `SkillLogic` int(10) unsigned NOT NULL DEFAULT '0',
+  `LanguageID` int(10) unsigned NOT NULL DEFAULT '0',
+  `MinLanguage` int(10) unsigned NOT NULL DEFAULT '0',
+  `MaxLanguage` int(10) unsigned NOT NULL DEFAULT '0',
+  `MinFactionID1` int(10) unsigned NOT NULL DEFAULT '0',
+  `MinFactionID2` int(10) unsigned NOT NULL DEFAULT '0',
+  `MinFactionID3` int(10) unsigned NOT NULL DEFAULT '0',
+  `MaxFactionID` int(10) unsigned NOT NULL DEFAULT '0',
+  `MinReputation1` int(10) unsigned NOT NULL DEFAULT '0',
+  `MinReputation2` int(10) unsigned NOT NULL DEFAULT '0',
+  `MinReputation3` int(10) unsigned NOT NULL DEFAULT '0',
+  `MaxReputation` int(10) unsigned NOT NULL DEFAULT '0',
+  `ReputationLogic` int(10) unsigned NOT NULL DEFAULT '0',
+  `Unknown1` int(10) unsigned NOT NULL DEFAULT '0',
+  `MinPVPRank` int(10) unsigned NOT NULL DEFAULT '0',
+  `MaxPVPRank` int(10) unsigned NOT NULL DEFAULT '0',
+  `PvpMedal` int(10) unsigned NOT NULL DEFAULT '0',
+  `PrevQuestLogic` int(10) unsigned NOT NULL DEFAULT '0',
+  `PrevQuestID1` int(10) unsigned NOT NULL DEFAULT '0',
+  `PrevQuestID2` int(10) unsigned NOT NULL DEFAULT '0',
+  `PrevQuestID3` int(10) unsigned NOT NULL DEFAULT '0',
+  `PrevQuestID4` int(10) unsigned NOT NULL DEFAULT '0',
+  `CurrQuestLogic` int(10) unsigned NOT NULL DEFAULT '0',
+  `CurrQuestID1` int(10) unsigned NOT NULL DEFAULT '0',
+  `CurrQuestID2` int(10) unsigned NOT NULL DEFAULT '0',
+  `CurrQuestID3` int(10) unsigned NOT NULL DEFAULT '0',
+  `CurrQuestID4` int(10) unsigned NOT NULL DEFAULT '0',
+  `CurrentCompletedQuestLogic` int(10) unsigned NOT NULL DEFAULT '0',
+  `CurrentCompletedQuestID1` int(10) unsigned NOT NULL DEFAULT '0',
+  `CurrentCompletedQuestID2` int(10) unsigned NOT NULL DEFAULT '0',
+  `CurrentCompletedQuestID3` int(10) unsigned NOT NULL DEFAULT '0',
+  `CurrentCompletedQuestID4` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellLogic` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellID1` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellID2` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellID3` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellID4` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemLogic` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemID1` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemID2` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemID3` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemID4` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemCount1` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemCount2` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemCount3` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemCount4` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemFlags` int(10) unsigned NOT NULL DEFAULT '0',
+  `Explored1` int(10) unsigned NOT NULL DEFAULT '0',
+  `Explored2` int(10) unsigned NOT NULL DEFAULT '0',
+  `Time1` int(10) unsigned NOT NULL DEFAULT '0',
+  `Time2` int(10) unsigned NOT NULL DEFAULT '0',
+  `AuraSpellLogic` int(10) unsigned NOT NULL DEFAULT '0',
+  `AuraSpellID1` int(10) unsigned NOT NULL DEFAULT '0',
+  `AuraSpellID2` int(10) unsigned NOT NULL DEFAULT '0',
+  `AuraSpellID3` int(10) unsigned NOT NULL DEFAULT '0',
+  `AuraSpellID4` int(10) unsigned NOT NULL DEFAULT '0',
+  `WorldStateExpressionID` int(10) unsigned NOT NULL DEFAULT '0',
+  `WeatherID` int(10) unsigned NOT NULL DEFAULT '0',
+  `PartyStatus` int(10) unsigned NOT NULL DEFAULT '0',
+  `LifetimeMaxPVPRank` int(10) unsigned NOT NULL DEFAULT '0',
+  `AchievementLogic` int(10) unsigned NOT NULL DEFAULT '0',
+  `Achievement1` int(10) unsigned NOT NULL DEFAULT '0',
+  `Achievement2` int(10) unsigned NOT NULL DEFAULT '0',
+  `Achievement3` int(10) unsigned NOT NULL DEFAULT '0',
+  `Achievement4` int(10) unsigned NOT NULL DEFAULT '0',
+  `LfgLogic` int(10) unsigned NOT NULL DEFAULT '0',
+  `LfgStatus1` int(10) unsigned NOT NULL DEFAULT '0',
+  `LfgStatus2` int(10) unsigned NOT NULL DEFAULT '0',
+  `LfgStatus3` int(10) unsigned NOT NULL DEFAULT '0',
+  `LfgStatus4` int(10) unsigned NOT NULL DEFAULT '0',
+  `LfgCompare1` int(10) unsigned NOT NULL DEFAULT '0',
+  `LfgCompare2` int(10) unsigned NOT NULL DEFAULT '0',
+  `LfgCompare3` int(10) unsigned NOT NULL DEFAULT '0',
+  `LfgCompare4` int(10) unsigned NOT NULL DEFAULT '0',
+  `LfgValue1` int(10) unsigned NOT NULL DEFAULT '0',
+  `LfgValue2` int(10) unsigned NOT NULL DEFAULT '0',
+  `LfgValue3` int(10) unsigned NOT NULL DEFAULT '0',
+  `LfgValue4` int(10) unsigned NOT NULL DEFAULT '0',
+  `AreaLogic` int(10) unsigned NOT NULL DEFAULT '0',
+  `AreaID1` int(10) unsigned NOT NULL DEFAULT '0',
+  `AreaID2` int(10) unsigned NOT NULL DEFAULT '0',
+  `AreaID3` int(10) unsigned NOT NULL DEFAULT '0',
+  `AreaID4` int(10) unsigned NOT NULL DEFAULT '0',
+  `CurrencyLogic` int(10) unsigned NOT NULL DEFAULT '0',
+  `CurrencyID1` int(10) unsigned NOT NULL DEFAULT '0',
+  `CurrencyID2` int(10) unsigned NOT NULL DEFAULT '0',
+  `CurrencyID3` int(10) unsigned NOT NULL DEFAULT '0',
+  `CurrencyID4` int(10) unsigned NOT NULL DEFAULT '0',
+  `CurrencyCount1` int(10) unsigned NOT NULL DEFAULT '0',
+  `CurrencyCount2` int(10) unsigned NOT NULL DEFAULT '0',
+  `CurrencyCount3` int(10) unsigned NOT NULL DEFAULT '0',
+  `CurrencyCount4` int(10) unsigned NOT NULL DEFAULT '0',
+  `QuestKillID` int(10) unsigned NOT NULL DEFAULT '0',
+  `QuestKillLogic` int(10) unsigned NOT NULL DEFAULT '0',
+  `QuestKillMonster1` int(10) unsigned NOT NULL DEFAULT '0',
+  `QuestKillMonster2` int(10) unsigned NOT NULL DEFAULT '0',
+  `QuestKillMonster3` int(10) unsigned NOT NULL DEFAULT '0',
+  `QuestKillMonster4` int(10) unsigned NOT NULL DEFAULT '0',
+  `MinExpansionLevel` int(11) NOT NULL DEFAULT '0',
+  `MaxExpansionLevel` int(11) NOT NULL DEFAULT '0',
+  `MinExpansionTier` int(11) NOT NULL DEFAULT '0',
+  `MaxExpansionTier` int(11) NOT NULL DEFAULT '0',
+  `MinGuildLevel` int(10) unsigned NOT NULL DEFAULT '0',
+  `MaxGuildLevel` int(10) unsigned NOT NULL DEFAULT '0',
+  `PhaseUseFlags` int(10) unsigned NOT NULL DEFAULT '0',
+  `PhaseID` int(10) unsigned NOT NULL DEFAULT '0',
+  `PhaseGroupID` int(10) unsigned NOT NULL DEFAULT '0',
+  `MinAvgItemLevel` int(10) unsigned NOT NULL DEFAULT '0',
+  `MaxAvgItemLevel` int(10) unsigned NOT NULL DEFAULT '0',
+  `MinAvgEquippedItemLevel` int(10) unsigned NOT NULL DEFAULT '0',
+  `MaxAvgEquippedItemLevel` int(10) unsigned NOT NULL DEFAULT '0',
+  `ChrSpecializationIndex` int(11) NOT NULL DEFAULT '0',
+  `ChrSpecializationRole` int(11) NOT NULL DEFAULT '0',
+  `FailureDescription` text,
+  `PowerType` int(11) NOT NULL DEFAULT '0',
+  `PowerTypeComp` int(11) NOT NULL DEFAULT '0',
+  `PowerTypeValue` int(11) NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `player_condition_locale`
+--
+
+DROP TABLE IF EXISTS `player_condition_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `player_condition_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `FailureDescription_lang` text,
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`locale`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `quest_money_reward`
 --
 
@@ -2779,6 +3227,40 @@ CREATE TABLE `totem_category_locale` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `toy`
+--
+
+DROP TABLE IF EXISTS `toy`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `toy` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
+  `Description` text,
+  `CategoryFilter` int(10) NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `toy_locale`
+--
+
+DROP TABLE IF EXISTS `toy_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `toy_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `Description_lang` text NOT NULL,
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`locale`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `transport_animation`
 --
 
@@ -2962,4 +3444,4 @@ CREATE TABLE `world_map_overlay_locale` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2015-07-13 23:52:10
+-- Dump completed on 2016-04-11  2:02:49
diff --git a/sql/base/dev/world_database.sql b/sql/base/dev/world_database.sql
index 987fd97aff3..e6973f5ad46 100644
--- a/sql/base/dev/world_database.sql
+++ b/sql/base/dev/world_database.sql
@@ -1,6 +1,6 @@
 -- MySQL dump 10.13  Distrib 5.6.26, for Win64 (x86_64)
 --
--- Host: localhost    Database: world6_temp
+-- Host: localhost    Database: world6
 -- ------------------------------------------------------
 -- Server version	5.6.26-log
 
@@ -3470,4 +3470,4 @@ CREATE TABLE `waypoints` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2015-11-08  1:52:20
+-- Dump completed on 2016-04-11  2:02:48
diff --git a/sql/updates/auth/2015_11_08_00_auth.sql b/sql/old/6.x/auth/03_2016_04_11/2015_11_08_00_auth.sql
index be8a4d21b66..be8a4d21b66 100644
--- a/sql/updates/auth/2015_11_08_00_auth.sql
+++ b/sql/old/6.x/auth/03_2016_04_11/2015_11_08_00_auth.sql
diff --git a/sql/updates/auth/2015_11_21_00_auth.sql b/sql/old/6.x/auth/03_2016_04_11/2015_11_21_00_auth.sql
index 8f025e61242..8f025e61242 100644
--- a/sql/updates/auth/2015_11_21_00_auth.sql
+++ b/sql/old/6.x/auth/03_2016_04_11/2015_11_21_00_auth.sql
diff --git a/sql/updates/auth/2015_12_07_00_auth.sql b/sql/old/6.x/auth/03_2016_04_11/2015_12_07_00_auth.sql
index 6847e48a7e9..6847e48a7e9 100644
--- a/sql/updates/auth/2015_12_07_00_auth.sql
+++ b/sql/old/6.x/auth/03_2016_04_11/2015_12_07_00_auth.sql
diff --git a/sql/updates/auth/2016_01_13_00_auth.sql b/sql/old/6.x/auth/03_2016_04_11/2016_01_13_00_auth.sql
index 7f1b2953750..7f1b2953750 100644
--- a/sql/updates/auth/2016_01_13_00_auth.sql
+++ b/sql/old/6.x/auth/03_2016_04_11/2016_01_13_00_auth.sql
diff --git a/sql/updates/auth/2016_03_22_01_auth_2016_01_13_00_auth.sql b/sql/old/6.x/auth/03_2016_04_11/2016_03_22_01_auth_2016_01_13_00_auth.sql
index c70d4c09468..c70d4c09468 100644
--- a/sql/updates/auth/2016_03_22_01_auth_2016_01_13_00_auth.sql
+++ b/sql/old/6.x/auth/03_2016_04_11/2016_03_22_01_auth_2016_01_13_00_auth.sql
diff --git a/sql/updates/auth/2016_03_28_00_auth.sql b/sql/old/6.x/auth/03_2016_04_11/2016_03_28_00_auth.sql
index 2adcb9bce4c..2adcb9bce4c 100644
--- a/sql/updates/auth/2016_03_28_00_auth.sql
+++ b/sql/old/6.x/auth/03_2016_04_11/2016_03_28_00_auth.sql
diff --git a/sql/updates/characters/2015_11_08_00_characters.sql b/sql/old/6.x/characters/03_2016_04_11/2015_11_08_00_characters.sql
index be8a4d21b66..be8a4d21b66 100644
--- a/sql/updates/characters/2015_11_08_00_characters.sql
+++ b/sql/old/6.x/characters/03_2016_04_11/2015_11_08_00_characters.sql
diff --git a/sql/updates/characters/2015_11_23_00_characters.sql b/sql/old/6.x/characters/03_2016_04_11/2015_11_23_00_characters.sql
index 940f792376f..940f792376f 100644
--- a/sql/updates/characters/2015_11_23_00_characters.sql
+++ b/sql/old/6.x/characters/03_2016_04_11/2015_11_23_00_characters.sql
diff --git a/sql/updates/characters/2016_01_05_00_characters.sql b/sql/old/6.x/characters/03_2016_04_11/2016_01_05_00_characters.sql
index 11850067be9..11850067be9 100644
--- a/sql/updates/characters/2016_01_05_00_characters.sql
+++ b/sql/old/6.x/characters/03_2016_04_11/2016_01_05_00_characters.sql
diff --git a/sql/updates/characters/2016_04_05_00_characters_2016_02_10_00_characters.sql b/sql/old/6.x/characters/03_2016_04_11/2016_04_05_00_characters_2016_02_10_00_characters.sql
index d49ed155bc8..d49ed155bc8 100644
--- a/sql/updates/characters/2016_04_05_00_characters_2016_02_10_00_characters.sql
+++ b/sql/old/6.x/characters/03_2016_04_11/2016_04_05_00_characters_2016_02_10_00_characters.sql
diff --git a/sql/updates/hotfixes/2015_11_08_00_hotfixes.sql b/sql/old/6.x/hotfixes/03_2016_04_11/2015_11_08_00_hotfixes.sql
index be8a4d21b66..be8a4d21b66 100644
--- a/sql/updates/hotfixes/2015_11_08_00_hotfixes.sql
+++ b/sql/old/6.x/hotfixes/03_2016_04_11/2015_11_08_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/2016_01_03_00_hotfixes.sql b/sql/old/6.x/hotfixes/03_2016_04_11/2016_01_03_00_hotfixes.sql
index 45ab99f7084..45ab99f7084 100644
--- a/sql/updates/hotfixes/2016_01_03_00_hotfixes.sql
+++ b/sql/old/6.x/hotfixes/03_2016_04_11/2016_01_03_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/2016_01_10_00_hotfixes.sql b/sql/old/6.x/hotfixes/03_2016_04_11/2016_01_10_00_hotfixes.sql
index 478c9d9c093..478c9d9c093 100644
--- a/sql/updates/hotfixes/2016_01_10_00_hotfixes.sql
+++ b/sql/old/6.x/hotfixes/03_2016_04_11/2016_01_10_00_hotfixes.sql
diff --git a/sql/updates/world/2015_11_08_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2015_11_08_00_world.sql
index 59365e2a4a7..59365e2a4a7 100644
--- a/sql/updates/world/2015_11_08_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2015_11_08_00_world.sql
diff --git a/sql/updates/world/2015_11_08_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2015_11_08_01_world.sql
index ab74f6826e4..ab74f6826e4 100644
--- a/sql/updates/world/2015_11_08_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2015_11_08_01_world.sql
diff --git a/sql/updates/world/2015_11_09_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2015_11_09_00_world.sql
index e9360cf8963..e9360cf8963 100644
--- a/sql/updates/world/2015_11_09_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2015_11_09_00_world.sql
diff --git a/sql/updates/world/2015_11_09_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2015_11_09_01_world.sql
index 6fd5dec39b7..6fd5dec39b7 100644
--- a/sql/updates/world/2015_11_09_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2015_11_09_01_world.sql
diff --git a/sql/updates/world/2015_11_09_02_world.sql b/sql/old/6.x/world/03_2016_04_11/2015_11_09_02_world.sql
index 6cccbef3d41..6cccbef3d41 100644
--- a/sql/updates/world/2015_11_09_02_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2015_11_09_02_world.sql
diff --git a/sql/updates/world/2015_11_10_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2015_11_10_00_world.sql
index 6e969f288f1..6e969f288f1 100644
--- a/sql/updates/world/2015_11_10_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2015_11_10_00_world.sql
diff --git a/sql/updates/world/2015_11_14_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2015_11_14_00_world.sql
index b3e49eb1114..b3e49eb1114 100644
--- a/sql/updates/world/2015_11_14_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2015_11_14_00_world.sql
diff --git a/sql/updates/world/2015_11_20_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2015_11_20_00_world.sql
index 8b2dba55f7c..8b2dba55f7c 100644
--- a/sql/updates/world/2015_11_20_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2015_11_20_00_world.sql
diff --git a/sql/updates/world/2015_11_23_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2015_11_23_00_world.sql
index 545b2948b6f..545b2948b6f 100644
--- a/sql/updates/world/2015_11_23_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2015_11_23_00_world.sql
diff --git a/sql/updates/world/2015_11_23_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2015_11_23_01_world.sql
index 1fca52cfc2f..1fca52cfc2f 100644
--- a/sql/updates/world/2015_11_23_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2015_11_23_01_world.sql
diff --git a/sql/updates/world/2015_11_23_02_world.sql b/sql/old/6.x/world/03_2016_04_11/2015_11_23_02_world.sql
index f79335b578c..f79335b578c 100644
--- a/sql/updates/world/2015_11_23_02_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2015_11_23_02_world.sql
diff --git a/sql/updates/world/2015_11_23_03_world.sql b/sql/old/6.x/world/03_2016_04_11/2015_11_23_03_world.sql
index 579af5a5ca1..579af5a5ca1 100644
--- a/sql/updates/world/2015_11_23_03_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2015_11_23_03_world.sql
diff --git a/sql/updates/world/2015_11_24_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2015_11_24_00_world.sql
index 218b2b8a7bf..218b2b8a7bf 100644
--- a/sql/updates/world/2015_11_24_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2015_11_24_00_world.sql
diff --git a/sql/updates/world/2015_11_25_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2015_11_25_00_world.sql
index a00440e018e..a00440e018e 100644
--- a/sql/updates/world/2015_11_25_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2015_11_25_00_world.sql
diff --git a/sql/updates/world/2015_11_26_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2015_11_26_00_world.sql
index 62574617869..62574617869 100644
--- a/sql/updates/world/2015_11_26_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2015_11_26_00_world.sql
diff --git a/sql/updates/world/2015_11_27_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2015_11_27_00_world.sql
index bcd5b3ee3b1..bcd5b3ee3b1 100644
--- a/sql/updates/world/2015_11_27_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2015_11_27_00_world.sql
diff --git a/sql/updates/world/2015_11_27_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2015_11_27_01_world.sql
index fbc2816ec3c..fbc2816ec3c 100644
--- a/sql/updates/world/2015_11_27_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2015_11_27_01_world.sql
diff --git a/sql/updates/world/2015_11_28_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2015_11_28_00_world.sql
index 0a1dd574fb4..0a1dd574fb4 100644
--- a/sql/updates/world/2015_11_28_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2015_11_28_00_world.sql
diff --git a/sql/updates/world/2015_11_29_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2015_11_29_00_world.sql
index fd64b65bd02..fd64b65bd02 100644
--- a/sql/updates/world/2015_11_29_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2015_11_29_00_world.sql
diff --git a/sql/updates/world/2015_11_29_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2015_11_29_01_world.sql
index cd46800c5dd..cd46800c5dd 100644
--- a/sql/updates/world/2015_11_29_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2015_11_29_01_world.sql
diff --git a/sql/updates/world/2015_12_04_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2015_12_04_00_world.sql
index ee721273bef..ee721273bef 100644
--- a/sql/updates/world/2015_12_04_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2015_12_04_00_world.sql
diff --git a/sql/updates/world/2015_12_05_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2015_12_05_00_world.sql
index c2c90164a4f..c2c90164a4f 100644
--- a/sql/updates/world/2015_12_05_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2015_12_05_00_world.sql
diff --git a/sql/updates/world/2015_12_09_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2015_12_09_00_world.sql
index 6ac4da31404..6ac4da31404 100644
--- a/sql/updates/world/2015_12_09_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2015_12_09_00_world.sql
diff --git a/sql/updates/world/2015_12_09_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2015_12_09_01_world.sql
index d27bc7ff49a..d27bc7ff49a 100644
--- a/sql/updates/world/2015_12_09_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2015_12_09_01_world.sql
diff --git a/sql/updates/world/2015_12_11_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2015_12_11_00_world.sql
index 5d4578d7dea..5d4578d7dea 100644
--- a/sql/updates/world/2015_12_11_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2015_12_11_00_world.sql
diff --git a/sql/updates/world/2015_12_14_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2015_12_14_00_world.sql
index 61aea89e192..61aea89e192 100644
--- a/sql/updates/world/2015_12_14_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2015_12_14_00_world.sql
diff --git a/sql/updates/world/2015_12_14_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2015_12_14_01_world.sql
index e9fea1734ec..e9fea1734ec 100644
--- a/sql/updates/world/2015_12_14_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2015_12_14_01_world.sql
diff --git a/sql/updates/world/2015_12_15_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2015_12_15_00_world.sql
index f27bb448bbd..f27bb448bbd 100644
--- a/sql/updates/world/2015_12_15_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2015_12_15_00_world.sql
diff --git a/sql/updates/world/2015_12_15_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2015_12_15_01_world.sql
index eda5c26550f..eda5c26550f 100644
--- a/sql/updates/world/2015_12_15_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2015_12_15_01_world.sql
diff --git a/sql/updates/world/2015_12_18_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2015_12_18_00_world.sql
index 894d58c30b5..894d58c30b5 100644
--- a/sql/updates/world/2015_12_18_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2015_12_18_00_world.sql
diff --git a/sql/updates/world/2015_12_22_00_world_2015_11_08_00.sql b/sql/old/6.x/world/03_2016_04_11/2015_12_22_00_world_2015_11_08_00.sql
index cbe2d0c37aa..cbe2d0c37aa 100644
--- a/sql/updates/world/2015_12_22_00_world_2015_11_08_00.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2015_12_22_00_world_2015_11_08_00.sql
diff --git a/sql/updates/world/2015_12_22_01_world_2015_11_08_01.sql b/sql/old/6.x/world/03_2016_04_11/2015_12_22_01_world_2015_11_08_01.sql
index 901ecd11351..901ecd11351 100644
--- a/sql/updates/world/2015_12_22_01_world_2015_11_08_01.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2015_12_22_01_world_2015_11_08_01.sql
diff --git a/sql/updates/world/2015_12_22_02_world_2015_11_10_01.sql b/sql/old/6.x/world/03_2016_04_11/2015_12_22_02_world_2015_11_10_01.sql
index fe9c0b1b8e2..fe9c0b1b8e2 100644
--- a/sql/updates/world/2015_12_22_02_world_2015_11_10_01.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2015_12_22_02_world_2015_11_10_01.sql
diff --git a/sql/updates/world/2015_12_22_03_world_2015_11_10_02.sql b/sql/old/6.x/world/03_2016_04_11/2015_12_22_03_world_2015_11_10_02.sql
index 8ff255defa4..8ff255defa4 100644
--- a/sql/updates/world/2015_12_22_03_world_2015_11_10_02.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2015_12_22_03_world_2015_11_10_02.sql
diff --git a/sql/updates/world/2015_12_30_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2015_12_30_00_world.sql
index b11f909ceca..b11f909ceca 100644
--- a/sql/updates/world/2015_12_30_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2015_12_30_00_world.sql
diff --git a/sql/updates/world/2016_01_01_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_01_00_world.sql
index 889f968b6c4..889f968b6c4 100644
--- a/sql/updates/world/2016_01_01_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_01_00_world.sql
diff --git a/sql/updates/world/2016_01_01_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_01_01_world.sql
index c7ba115b05a..c7ba115b05a 100644
--- a/sql/updates/world/2016_01_01_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_01_01_world.sql
diff --git a/sql/updates/world/2016_01_01_02_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_01_02_world.sql
index 76c8b646a73..76c8b646a73 100644
--- a/sql/updates/world/2016_01_01_02_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_01_02_world.sql
diff --git a/sql/updates/world/2016_01_02_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_02_00_world.sql
index 4d522dc2050..4d522dc2050 100644
--- a/sql/updates/world/2016_01_02_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_02_00_world.sql
diff --git a/sql/updates/world/2016_01_02_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_02_01_world.sql
index b862cc0e644..b862cc0e644 100644
--- a/sql/updates/world/2016_01_02_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_02_01_world.sql
diff --git a/sql/updates/world/2016_01_03_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_03_00_world.sql
index 3a3cfc7f96b..3a3cfc7f96b 100644
--- a/sql/updates/world/2016_01_03_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_03_00_world.sql
diff --git a/sql/updates/world/2016_01_13_00_world_2015_11_11_00.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_13_00_world_2015_11_11_00.sql
index b4c8989c213..b4c8989c213 100644
--- a/sql/updates/world/2016_01_13_00_world_2015_11_11_00.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_13_00_world_2015_11_11_00.sql
diff --git a/sql/updates/world/2016_01_13_01_world_2015_11_12_00.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_13_01_world_2015_11_12_00.sql
index 6a9261b33e0..6a9261b33e0 100644
--- a/sql/updates/world/2016_01_13_01_world_2015_11_12_00.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_13_01_world_2015_11_12_00.sql
diff --git a/sql/updates/world/2016_01_13_playerdamagereq.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_13_playerdamagereq.sql
index ce561af3a61..ce561af3a61 100644
--- a/sql/updates/world/2016_01_13_playerdamagereq.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_13_playerdamagereq.sql
diff --git a/sql/updates/world/2016_01_15_00_world_2015_11_12_01.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_15_00_world_2015_11_12_01.sql
index 79ed2252151..79ed2252151 100644
--- a/sql/updates/world/2016_01_15_00_world_2015_11_12_01.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_15_00_world_2015_11_12_01.sql
diff --git a/sql/updates/world/2016_01_15_01_world_2015_11_20_00.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_15_01_world_2015_11_20_00.sql
index 7c5fe7ea426..7c5fe7ea426 100644
--- a/sql/updates/world/2016_01_15_01_world_2015_11_20_00.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_15_01_world_2015_11_20_00.sql
diff --git a/sql/updates/world/2016_01_15_02_world_2015_11_22_01.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_15_02_world_2015_11_22_01.sql
index ba63c72ba16..ba63c72ba16 100644
--- a/sql/updates/world/2016_01_15_02_world_2015_11_22_01.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_15_02_world_2015_11_22_01.sql
diff --git a/sql/updates/world/2016_01_15_03_world_2015_12_01_00.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_15_03_world_2015_12_01_00.sql
index 6945c99d468..6945c99d468 100644
--- a/sql/updates/world/2016_01_15_03_world_2015_12_01_00.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_15_03_world_2015_12_01_00.sql
diff --git a/sql/updates/world/2016_01_15_04_world_2015_12_08_01.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_15_04_world_2015_12_08_01.sql
index 9e24acd91db..9e24acd91db 100644
--- a/sql/updates/world/2016_01_15_04_world_2015_12_08_01.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_15_04_world_2015_12_08_01.sql
diff --git a/sql/updates/world/2016_01_15_05_world_2015_12_08_02.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_15_05_world_2015_12_08_02.sql
index 375d0941adb..375d0941adb 100644
--- a/sql/updates/world/2016_01_15_05_world_2015_12_08_02.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_15_05_world_2015_12_08_02.sql
diff --git a/sql/updates/world/2016_01_16_00_world_2015_12_14_00.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_16_00_world_2015_12_14_00.sql
index 85faf4448e2..85faf4448e2 100644
--- a/sql/updates/world/2016_01_16_00_world_2015_12_14_00.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_16_00_world_2015_12_14_00.sql
diff --git a/sql/updates/world/2016_01_16_01_world_2015_12_15_03.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_16_01_world_2015_12_15_03.sql
index 99cc9e14646..99cc9e14646 100644
--- a/sql/updates/world/2016_01_16_01_world_2015_12_15_03.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_16_01_world_2015_12_15_03.sql
diff --git a/sql/updates/world/2016_01_16_02_world_2015_12_16_00.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_16_02_world_2015_12_16_00.sql
index 62d640117f7..62d640117f7 100644
--- a/sql/updates/world/2016_01_16_02_world_2015_12_16_00.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_16_02_world_2015_12_16_00.sql
diff --git a/sql/updates/world/2016_01_16_03_world_2015_12_16_01.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_16_03_world_2015_12_16_01.sql
index 73c9675e5be..73c9675e5be 100644
--- a/sql/updates/world/2016_01_16_03_world_2015_12_16_01.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_16_03_world_2015_12_16_01.sql
diff --git a/sql/updates/world/2016_01_16_04_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_16_04_world.sql
index a6bb7ae185c..a6bb7ae185c 100644
--- a/sql/updates/world/2016_01_16_04_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_16_04_world.sql
diff --git a/sql/updates/world/2016_01_16_05_world_2015_12_17_00.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_16_05_world_2015_12_17_00.sql
index 8419473b203..8419473b203 100644
--- a/sql/updates/world/2016_01_16_05_world_2015_12_17_00.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_16_05_world_2015_12_17_00.sql
diff --git a/sql/updates/world/2016_01_16_06_world_2015_12_18_01.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_16_06_world_2015_12_18_01.sql
index 2ccc93def23..2ccc93def23 100644
--- a/sql/updates/world/2016_01_16_06_world_2015_12_18_01.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_16_06_world_2015_12_18_01.sql
diff --git a/sql/updates/world/2016_01_16_07_world_2015_12_18_02.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_16_07_world_2015_12_18_02.sql
index f590d18a8ab..f590d18a8ab 100644
--- a/sql/updates/world/2016_01_16_07_world_2015_12_18_02.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_16_07_world_2015_12_18_02.sql
diff --git a/sql/updates/world/2016_01_16_08_world_2015_12_18_04.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_16_08_world_2015_12_18_04.sql
index c8c3352319c..c8c3352319c 100644
--- a/sql/updates/world/2016_01_16_08_world_2015_12_18_04.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_16_08_world_2015_12_18_04.sql
diff --git a/sql/updates/world/2016_01_16_09_world_2015_12_20_00.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_16_09_world_2015_12_20_00.sql
index 5f8c6b168ce..5f8c6b168ce 100644
--- a/sql/updates/world/2016_01_16_09_world_2015_12_20_00.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_16_09_world_2015_12_20_00.sql
diff --git a/sql/updates/world/2016_01_16_10_world_2015_12_24_00.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_16_10_world_2015_12_24_00.sql
index 52d83bb63c3..52d83bb63c3 100644
--- a/sql/updates/world/2016_01_16_10_world_2015_12_24_00.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_16_10_world_2015_12_24_00.sql
diff --git a/sql/updates/world/2016_01_17_00_world_2015_12_15_01.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_17_00_world_2015_12_15_01.sql
index 86fbec83c38..86fbec83c38 100644
--- a/sql/updates/world/2016_01_17_00_world_2015_12_15_01.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_17_00_world_2015_12_15_01.sql
diff --git a/sql/updates/world/2016_01_17_01_world_2015_12_26_00.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_17_01_world_2015_12_26_00.sql
index 02c0acbedae..02c0acbedae 100644
--- a/sql/updates/world/2016_01_17_01_world_2015_12_26_00.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_17_01_world_2015_12_26_00.sql
diff --git a/sql/updates/world/2016_01_17_02_world_2015_12_26_01.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_17_02_world_2015_12_26_01.sql
index 32ec7adf02b..32ec7adf02b 100644
--- a/sql/updates/world/2016_01_17_02_world_2015_12_26_01.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_17_02_world_2015_12_26_01.sql
diff --git a/sql/updates/world/2016_01_17_03_world_2015_12_26_02.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_17_03_world_2015_12_26_02.sql
index 8d51e8774d9..8d51e8774d9 100644
--- a/sql/updates/world/2016_01_17_03_world_2015_12_26_02.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_17_03_world_2015_12_26_02.sql
diff --git a/sql/updates/world/2016_01_17_04_world_2015_12_29_00.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_17_04_world_2015_12_29_00.sql
index da6de123190..da6de123190 100644
--- a/sql/updates/world/2016_01_17_04_world_2015_12_29_00.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_17_04_world_2015_12_29_00.sql
diff --git a/sql/updates/world/2016_01_17_05_world_2015_12_29_01.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_17_05_world_2015_12_29_01.sql
index 24b201b4d06..24b201b4d06 100644
--- a/sql/updates/world/2016_01_17_05_world_2015_12_29_01.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_17_05_world_2015_12_29_01.sql
diff --git a/sql/updates/world/2016_01_17_06_world_2015_12_29_02.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_17_06_world_2015_12_29_02.sql
index 3bfd0ba2a25..3bfd0ba2a25 100644
--- a/sql/updates/world/2016_01_17_06_world_2015_12_29_02.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_17_06_world_2015_12_29_02.sql
diff --git a/sql/updates/world/2016_01_17_07_world_2015_12_29_03.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_17_07_world_2015_12_29_03.sql
index f928061c269..f928061c269 100644
--- a/sql/updates/world/2016_01_17_07_world_2015_12_29_03.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_17_07_world_2015_12_29_03.sql
diff --git a/sql/updates/world/2016_01_17_08_world_2015_12_29_04.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_17_08_world_2015_12_29_04.sql
index 22a1ee3edcf..22a1ee3edcf 100644
--- a/sql/updates/world/2016_01_17_08_world_2015_12_29_04.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_17_08_world_2015_12_29_04.sql
diff --git a/sql/updates/world/2016_01_17_09_world_2015_12_29_05.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_17_09_world_2015_12_29_05.sql
index 056ea4fe230..056ea4fe230 100644
--- a/sql/updates/world/2016_01_17_09_world_2015_12_29_05.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_17_09_world_2015_12_29_05.sql
diff --git a/sql/updates/world/2016_01_17_10_world_2015_12_29_06.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_17_10_world_2015_12_29_06.sql
index 167c4c23005..167c4c23005 100644
--- a/sql/updates/world/2016_01_17_10_world_2015_12_29_06.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_17_10_world_2015_12_29_06.sql
diff --git a/sql/updates/world/2016_01_17_11_world_2015_12_29_07.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_17_11_world_2015_12_29_07.sql
index ec71d28c787..ec71d28c787 100644
--- a/sql/updates/world/2016_01_17_11_world_2015_12_29_07.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_17_11_world_2015_12_29_07.sql
diff --git a/sql/updates/world/2016_01_17_12_world_2015_12_29_08.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_17_12_world_2015_12_29_08.sql
index ce874d7a8d2..ce874d7a8d2 100644
--- a/sql/updates/world/2016_01_17_12_world_2015_12_29_08.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_17_12_world_2015_12_29_08.sql
diff --git a/sql/updates/world/2016_01_17_13_world_2015_12_29_09.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_17_13_world_2015_12_29_09.sql
index d57785e8d88..d57785e8d88 100644
--- a/sql/updates/world/2016_01_17_13_world_2015_12_29_09.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_17_13_world_2015_12_29_09.sql
diff --git a/sql/updates/world/2016_01_17_14_world_2015_12_29_10.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_17_14_world_2015_12_29_10.sql
index 919309dd558..919309dd558 100644
--- a/sql/updates/world/2016_01_17_14_world_2015_12_29_10.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_17_14_world_2015_12_29_10.sql
diff --git a/sql/updates/world/2016_01_17_15_world_2015_12_29_11.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_17_15_world_2015_12_29_11.sql
index 930baf15f78..930baf15f78 100644
--- a/sql/updates/world/2016_01_17_15_world_2015_12_29_11.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_17_15_world_2015_12_29_11.sql
diff --git a/sql/updates/world/2016_01_17_16_world_2015_12_29_12.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_17_16_world_2015_12_29_12.sql
index c065e1d6a18..c065e1d6a18 100644
--- a/sql/updates/world/2016_01_17_16_world_2015_12_29_12.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_17_16_world_2015_12_29_12.sql
diff --git a/sql/updates/world/2016_01_17_17_world_2015_12_29_13.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_17_17_world_2015_12_29_13.sql
index fc182ae49fb..fc182ae49fb 100644
--- a/sql/updates/world/2016_01_17_17_world_2015_12_29_13.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_17_17_world_2015_12_29_13.sql
diff --git a/sql/updates/world/2016_01_17_18_world_2015_12_31_00.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_17_18_world_2015_12_31_00.sql
index 43f86e84cb3..43f86e84cb3 100644
--- a/sql/updates/world/2016_01_17_18_world_2015_12_31_00.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_17_18_world_2015_12_31_00.sql
diff --git a/sql/updates/world/2016_01_17_19_world_2016_01_01_00.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_17_19_world_2016_01_01_00.sql
index 38991837113..38991837113 100644
--- a/sql/updates/world/2016_01_17_19_world_2016_01_01_00.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_17_19_world_2016_01_01_00.sql
diff --git a/sql/updates/world/2016_01_17_20_world_2016_01_01_01.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_17_20_world_2016_01_01_01.sql
index 025f2c07f9c..025f2c07f9c 100644
--- a/sql/updates/world/2016_01_17_20_world_2016_01_01_01.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_17_20_world_2016_01_01_01.sql
diff --git a/sql/updates/world/2016_01_17_21_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_17_21_world.sql
index 68f78c6eaec..68f78c6eaec 100644
--- a/sql/updates/world/2016_01_17_21_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_17_21_world.sql
diff --git a/sql/updates/world/2016_01_22_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_22_00_world.sql
index 196d006acad..196d006acad 100644
--- a/sql/updates/world/2016_01_22_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_22_00_world.sql
diff --git a/sql/updates/world/2016_01_22_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_22_01_world.sql
index 657b58c150d..657b58c150d 100644
--- a/sql/updates/world/2016_01_22_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_22_01_world.sql
diff --git a/sql/updates/world/2016_01_22_02_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_22_02_world.sql
index 9d31eec6e78..9d31eec6e78 100644
--- a/sql/updates/world/2016_01_22_02_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_22_02_world.sql
diff --git a/sql/updates/world/2016_01_22_03_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_22_03_world.sql
index 75e3980b26f..75e3980b26f 100644
--- a/sql/updates/world/2016_01_22_03_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_22_03_world.sql
diff --git a/sql/updates/world/2016_01_23_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_23_00_world.sql
index 177c8508d20..177c8508d20 100644
--- a/sql/updates/world/2016_01_23_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_23_00_world.sql
diff --git a/sql/updates/world/2016_01_26_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_26_00_world.sql
index 3a7a6cab8c4..3a7a6cab8c4 100644
--- a/sql/updates/world/2016_01_26_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_26_00_world.sql
diff --git a/sql/updates/world/2016_01_27_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_01_27_00_world.sql
index 0690f8ceed7..0690f8ceed7 100644
--- a/sql/updates/world/2016_01_27_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_01_27_00_world.sql
diff --git a/sql/updates/world/2016_02_10_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_02_10_00_world.sql
index 872861b08dc..872861b08dc 100644
--- a/sql/updates/world/2016_02_10_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_02_10_00_world.sql
diff --git a/sql/updates/world/2016_02_10_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_02_10_01_world.sql
index 2b8cca7cfb0..2b8cca7cfb0 100644
--- a/sql/updates/world/2016_02_10_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_02_10_01_world.sql
diff --git a/sql/updates/world/2016_02_10_02_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_02_10_02_world.sql
index 967295f1fec..967295f1fec 100644
--- a/sql/updates/world/2016_02_10_02_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_02_10_02_world.sql
diff --git a/sql/updates/world/2016_02_10_03_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_02_10_03_world.sql
index 9e53fa3431a..9e53fa3431a 100644
--- a/sql/updates/world/2016_02_10_03_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_02_10_03_world.sql
diff --git a/sql/updates/world/2016_02_10_04_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_02_10_04_world.sql
index 00397623b90..00397623b90 100644
--- a/sql/updates/world/2016_02_10_04_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_02_10_04_world.sql
diff --git a/sql/updates/world/2016_02_11_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_02_11_00_world.sql
index 929f34154de..929f34154de 100644
--- a/sql/updates/world/2016_02_11_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_02_11_00_world.sql
diff --git a/sql/updates/world/2016_02_11_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_02_11_01_world.sql
index 5a13d28f34b..5a13d28f34b 100644
--- a/sql/updates/world/2016_02_11_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_02_11_01_world.sql
diff --git a/sql/updates/world/2016_02_21_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_02_21_00_world.sql
index 599b4c70ff1..599b4c70ff1 100644
--- a/sql/updates/world/2016_02_21_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_02_21_00_world.sql
diff --git a/sql/updates/world/2016_03_07_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_07_00_world.sql
index 73385d6ab40..73385d6ab40 100644
--- a/sql/updates/world/2016_03_07_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_07_00_world.sql
diff --git a/sql/updates/world/2016_03_20_02_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_20_02_world.sql
index 9b03a9cdea3..9b03a9cdea3 100644
--- a/sql/updates/world/2016_03_20_02_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_20_02_world.sql
diff --git a/sql/updates/world/2016_03_21_00_world_2015_11_27_00.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_21_00_world_2015_11_27_00.sql
index 15be2ab73ed..15be2ab73ed 100644
--- a/sql/updates/world/2016_03_21_00_world_2015_11_27_00.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_21_00_world_2015_11_27_00.sql
diff --git a/sql/updates/world/2016_03_21_01_world_2015_12_27_instancerevive.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_21_01_world_2015_12_27_instancerevive.sql
index 3bee62963ef..3bee62963ef 100644
--- a/sql/updates/world/2016_03_21_01_world_2015_12_27_instancerevive.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_21_01_world_2015_12_27_instancerevive.sql
diff --git a/sql/updates/world/2016_03_21_02_world_2016_01_03_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_21_02_world_2016_01_03_01_world.sql
index 3ddb56a9c72..3ddb56a9c72 100644
--- a/sql/updates/world/2016_03_21_02_world_2016_01_03_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_21_02_world_2016_01_03_01_world.sql
diff --git a/sql/updates/world/2016_03_21_03_world_2016_01_03_02_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_21_03_world_2016_01_03_02_world.sql
index 79eba012e41..79eba012e41 100644
--- a/sql/updates/world/2016_03_21_03_world_2016_01_03_02_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_21_03_world_2016_01_03_02_world.sql
diff --git a/sql/updates/world/2016_03_21_04_world_2016_01_03_03_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_21_04_world_2016_01_03_03_world.sql
index 1b1766ee557..1b1766ee557 100644
--- a/sql/updates/world/2016_03_21_04_world_2016_01_03_03_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_21_04_world_2016_01_03_03_world.sql
diff --git a/sql/updates/world/2016_03_21_05_world_2016_01_03_04_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_21_05_world_2016_01_03_04_world.sql
index ffe8eb07fd5..ffe8eb07fd5 100644
--- a/sql/updates/world/2016_03_21_05_world_2016_01_03_04_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_21_05_world_2016_01_03_04_world.sql
diff --git a/sql/updates/world/2016_03_21_06_world_2016_01_03_05_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_21_06_world_2016_01_03_05_world.sql
index 4c2fe0817f0..4c2fe0817f0 100644
--- a/sql/updates/world/2016_03_21_06_world_2016_01_03_05_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_21_06_world_2016_01_03_05_world.sql
diff --git a/sql/updates/world/2016_03_21_07_world_2016_01_05_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_21_07_world_2016_01_05_01_world.sql
index 22075b2cf33..22075b2cf33 100644
--- a/sql/updates/world/2016_03_21_07_world_2016_01_05_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_21_07_world_2016_01_05_01_world.sql
diff --git a/sql/updates/world/2016_03_21_08_world_2016_01_05_02_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_21_08_world_2016_01_05_02_world.sql
index 64909129e60..64909129e60 100644
--- a/sql/updates/world/2016_03_21_08_world_2016_01_05_02_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_21_08_world_2016_01_05_02_world.sql
diff --git a/sql/updates/world/2016_03_21_09_world_2016_01_07_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_21_09_world_2016_01_07_00_world.sql
index d36dda80e50..d36dda80e50 100644
--- a/sql/updates/world/2016_03_21_09_world_2016_01_07_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_21_09_world_2016_01_07_00_world.sql
diff --git a/sql/updates/world/2016_03_21_10_world_2016_01_09_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_21_10_world_2016_01_09_00_world.sql
index 534e17ccb00..534e17ccb00 100644
--- a/sql/updates/world/2016_03_21_10_world_2016_01_09_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_21_10_world_2016_01_09_00_world.sql
diff --git a/sql/updates/world/2016_03_22_00_world_2016_01_05_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_22_00_world_2016_01_05_00_world.sql
index 3f7f01449fc..3f7f01449fc 100644
--- a/sql/updates/world/2016_03_22_00_world_2016_01_05_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_22_00_world_2016_01_05_00_world.sql
diff --git a/sql/updates/world/2016_03_22_01_world_2016_01_07_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_22_01_world_2016_01_07_01_world.sql
index 4a15aa405ec..4a15aa405ec 100644
--- a/sql/updates/world/2016_03_22_01_world_2016_01_07_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_22_01_world_2016_01_07_01_world.sql
diff --git a/sql/updates/world/2016_03_22_02_world_2016_01_07_02_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_22_02_world_2016_01_07_02_world.sql
index 7724b42ac9d..7724b42ac9d 100644
--- a/sql/updates/world/2016_03_22_02_world_2016_01_07_02_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_22_02_world_2016_01_07_02_world.sql
diff --git a/sql/updates/world/2016_03_22_03_world_2016_01_10_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_22_03_world_2016_01_10_00_world.sql
index 83ed21c8489..83ed21c8489 100644
--- a/sql/updates/world/2016_03_22_03_world_2016_01_10_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_22_03_world_2016_01_10_00_world.sql
diff --git a/sql/updates/world/2016_03_22_04_world_2016_01_10_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_22_04_world_2016_01_10_01_world.sql
index c79c157a1a1..c79c157a1a1 100644
--- a/sql/updates/world/2016_03_22_04_world_2016_01_10_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_22_04_world_2016_01_10_01_world.sql
diff --git a/sql/updates/world/2016_03_22_05_world_2016_01_10_02_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_22_05_world_2016_01_10_02_world.sql
index eca8ef07849..eca8ef07849 100644
--- a/sql/updates/world/2016_03_22_05_world_2016_01_10_02_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_22_05_world_2016_01_10_02_world.sql
diff --git a/sql/updates/world/2016_03_22_06_world_2016_01_10_03_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_22_06_world_2016_01_10_03_world.sql
index 5ac352ffe10..5ac352ffe10 100644
--- a/sql/updates/world/2016_03_22_06_world_2016_01_10_03_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_22_06_world_2016_01_10_03_world.sql
diff --git a/sql/updates/world/2016_03_22_07_world_2016_01_10_04_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_22_07_world_2016_01_10_04_world.sql
index da6eed191ad..da6eed191ad 100644
--- a/sql/updates/world/2016_03_22_07_world_2016_01_10_04_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_22_07_world_2016_01_10_04_world.sql
diff --git a/sql/updates/world/2016_03_22_08_world_2016_01_12_03_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_22_08_world_2016_01_12_03_world.sql
index 6ff3a769918..6ff3a769918 100644
--- a/sql/updates/world/2016_03_22_08_world_2016_01_12_03_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_22_08_world_2016_01_12_03_world.sql
diff --git a/sql/updates/world/2016_03_22_09_world_2016_01_13_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_22_09_world_2016_01_13_00_world.sql
index cba5d3a18a1..cba5d3a18a1 100644
--- a/sql/updates/world/2016_03_22_09_world_2016_01_13_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_22_09_world_2016_01_13_00_world.sql
diff --git a/sql/updates/world/2016_03_22_10_world_2016_01_16_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_22_10_world_2016_01_16_01_world.sql
index 235378a7a84..235378a7a84 100644
--- a/sql/updates/world/2016_03_22_10_world_2016_01_16_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_22_10_world_2016_01_16_01_world.sql
diff --git a/sql/updates/world/2016_03_22_11_world_2016_01_16_02_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_22_11_world_2016_01_16_02_world.sql
index b36d7d69ff6..b36d7d69ff6 100644
--- a/sql/updates/world/2016_03_22_11_world_2016_01_16_02_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_22_11_world_2016_01_16_02_world.sql
diff --git a/sql/updates/world/2016_03_22_12_world_2016_01_16_03_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_22_12_world_2016_01_16_03_world.sql
index 5a06cfaecca..5a06cfaecca 100644
--- a/sql/updates/world/2016_03_22_12_world_2016_01_16_03_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_22_12_world_2016_01_16_03_world.sql
diff --git a/sql/updates/world/2016_03_22_13_world_2016_01_17_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_22_13_world_2016_01_17_01_world.sql
index 8e5bcd22a07..8e5bcd22a07 100644
--- a/sql/updates/world/2016_03_22_13_world_2016_01_17_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_22_13_world_2016_01_17_01_world.sql
diff --git a/sql/updates/world/2016_03_22_14_world_2016_01_17_02_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_22_14_world_2016_01_17_02_world.sql
index f019b927228..f019b927228 100644
--- a/sql/updates/world/2016_03_22_14_world_2016_01_17_02_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_22_14_world_2016_01_17_02_world.sql
diff --git a/sql/updates/world/2016_03_22_15_world_2016_01_17_06_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_22_15_world_2016_01_17_06_world.sql
index 659f146845a..659f146845a 100644
--- a/sql/updates/world/2016_03_22_15_world_2016_01_17_06_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_22_15_world_2016_01_17_06_world.sql
diff --git a/sql/updates/world/2016_03_22_16_world_2016_01_17_10_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_22_16_world_2016_01_17_10_world.sql
index 0fdc04eb60f..0fdc04eb60f 100644
--- a/sql/updates/world/2016_03_22_16_world_2016_01_17_10_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_22_16_world_2016_01_17_10_world.sql
diff --git a/sql/updates/world/2016_03_22_17_world_2016_01_17_13_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_22_17_world_2016_01_17_13_world.sql
index 163aa3fb659..163aa3fb659 100644
--- a/sql/updates/world/2016_03_22_17_world_2016_01_17_13_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_22_17_world_2016_01_17_13_world.sql
diff --git a/sql/updates/world/2016_03_22_18_world_2016_01_17_15_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_22_18_world_2016_01_17_15_world.sql
index da949d7100d..da949d7100d 100644
--- a/sql/updates/world/2016_03_22_18_world_2016_01_17_15_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_22_18_world_2016_01_17_15_world.sql
diff --git a/sql/updates/world/2016_03_22_19_world_2016_01_18_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_22_19_world_2016_01_18_00_world.sql
index 85f41cfc0c5..85f41cfc0c5 100644
--- a/sql/updates/world/2016_03_22_19_world_2016_01_18_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_22_19_world_2016_01_18_00_world.sql
diff --git a/sql/updates/world/2016_03_22_20_world_2016_01_18_04_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_22_20_world_2016_01_18_04_world.sql
index 28ab2d96731..28ab2d96731 100644
--- a/sql/updates/world/2016_03_22_20_world_2016_01_18_04_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_22_20_world_2016_01_18_04_world.sql
diff --git a/sql/updates/world/2016_03_23_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_23_00_world.sql
index b5a31f35526..b5a31f35526 100644
--- a/sql/updates/world/2016_03_23_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_23_00_world.sql
diff --git a/sql/updates/world/2016_03_25_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_25_00_world.sql
index 5860ffc308f..5860ffc308f 100644
--- a/sql/updates/world/2016_03_25_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_25_00_world.sql
diff --git a/sql/updates/world/2016_03_26_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_26_00_world.sql
index cd1d9645e9f..cd1d9645e9f 100644
--- a/sql/updates/world/2016_03_26_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_26_00_world.sql
diff --git a/sql/updates/world/2016_03_27_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_27_00_world.sql
index 3dc14c81aa2..3dc14c81aa2 100644
--- a/sql/updates/world/2016_03_27_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_27_00_world.sql
diff --git a/sql/updates/world/2016_03_28_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_28_00_world.sql
index 868163c2be7..868163c2be7 100644
--- a/sql/updates/world/2016_03_28_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_28_00_world.sql
diff --git a/sql/updates/world/2016_03_29_00_world_2016_01_04_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_29_00_world_2016_01_04_00_world.sql
index 57236a6f66e..57236a6f66e 100644
--- a/sql/updates/world/2016_03_29_00_world_2016_01_04_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_29_00_world_2016_01_04_00_world.sql
diff --git a/sql/updates/world/2016_03_29_01_world_2016_01_12_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_29_01_world_2016_01_12_00_world.sql
index 690b338fba1..690b338fba1 100644
--- a/sql/updates/world/2016_03_29_01_world_2016_01_12_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_29_01_world_2016_01_12_00_world.sql
diff --git a/sql/updates/world/2016_03_29_02_world_2016_01_16_05_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_29_02_world_2016_01_16_05_world.sql
index d50b44cd7b3..d50b44cd7b3 100644
--- a/sql/updates/world/2016_03_29_02_world_2016_01_16_05_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_29_02_world_2016_01_16_05_world.sql
diff --git a/sql/updates/world/2016_03_29_03_world_2016_01_17_07_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_29_03_world_2016_01_17_07_world.sql
index df588168d38..df588168d38 100644
--- a/sql/updates/world/2016_03_29_03_world_2016_01_17_07_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_29_03_world_2016_01_17_07_world.sql
diff --git a/sql/updates/world/2016_03_29_04_world_2016_01_17_08_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_29_04_world_2016_01_17_08_world.sql
index 48cd420a242..48cd420a242 100644
--- a/sql/updates/world/2016_03_29_04_world_2016_01_17_08_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_29_04_world_2016_01_17_08_world.sql
diff --git a/sql/updates/world/2016_03_29_05_world_2016_01_17_14_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_29_05_world_2016_01_17_14_world.sql
index c8b9405abff..c8b9405abff 100644
--- a/sql/updates/world/2016_03_29_05_world_2016_01_17_14_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_29_05_world_2016_01_17_14_world.sql
diff --git a/sql/updates/world/2016_03_29_06_world_2016_01_18_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_29_06_world_2016_01_18_01_world.sql
index 9768ecda6c0..9768ecda6c0 100644
--- a/sql/updates/world/2016_03_29_06_world_2016_01_18_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_29_06_world_2016_01_18_01_world.sql
diff --git a/sql/updates/world/2016_03_29_07_world_2016_01_18_02_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_29_07_world_2016_01_18_02_world.sql
index ec9a8748cc8..ec9a8748cc8 100644
--- a/sql/updates/world/2016_03_29_07_world_2016_01_18_02_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_29_07_world_2016_01_18_02_world.sql
diff --git a/sql/updates/world/2016_03_29_08_world_2016_01_18_05_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_29_08_world_2016_01_18_05_world.sql
index 0d28cd17642..0d28cd17642 100644
--- a/sql/updates/world/2016_03_29_08_world_2016_01_18_05_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_29_08_world_2016_01_18_05_world.sql
diff --git a/sql/updates/world/2016_03_30_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_03_30_00_world.sql
index e6795355bae..e6795355bae 100644
--- a/sql/updates/world/2016_03_30_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_03_30_00_world.sql
diff --git a/sql/updates/world/2016_04_01_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_01_00_world.sql
index ccab96b346e..ccab96b346e 100644
--- a/sql/updates/world/2016_04_01_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_01_00_world.sql
diff --git a/sql/updates/world/2016_04_01_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_01_01_world.sql
index ea27f3b92e3..ea27f3b92e3 100644
--- a/sql/updates/world/2016_04_01_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_01_01_world.sql
diff --git a/sql/updates/world/2016_04_01_02_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_01_02_world.sql
index 46444c28a87..46444c28a87 100644
--- a/sql/updates/world/2016_04_01_02_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_01_02_world.sql
diff --git a/sql/updates/world/2016_04_01_03_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_01_03_world.sql
index 1dd3fc2bc42..1dd3fc2bc42 100644
--- a/sql/updates/world/2016_04_01_03_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_01_03_world.sql
diff --git a/sql/updates/world/2016_04_02_00_world_2016_01_18_06_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_00_world_2016_01_18_06_world.sql
index f8b90c15f54..f8b90c15f54 100644
--- a/sql/updates/world/2016_04_02_00_world_2016_01_18_06_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_00_world_2016_01_18_06_world.sql
diff --git a/sql/updates/world/2016_04_02_01_world_2016_01_19_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_01_world_2016_01_19_00_world.sql
index f210b95c13a..f210b95c13a 100644
--- a/sql/updates/world/2016_04_02_01_world_2016_01_19_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_01_world_2016_01_19_00_world.sql
diff --git a/sql/updates/world/2016_04_02_02_world_2016_01_19_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_02_world_2016_01_19_01_world.sql
index baa4ded4c9b..baa4ded4c9b 100644
--- a/sql/updates/world/2016_04_02_02_world_2016_01_19_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_02_world_2016_01_19_01_world.sql
diff --git a/sql/updates/world/2016_04_02_03_world_2016_01_19_02_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_03_world_2016_01_19_02_world.sql
index 7c71156b248..7c71156b248 100644
--- a/sql/updates/world/2016_04_02_03_world_2016_01_19_02_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_03_world_2016_01_19_02_world.sql
diff --git a/sql/updates/world/2016_04_02_04_world_2016_01_19_04_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_04_world_2016_01_19_04_world.sql
index f4fe95f5539..f4fe95f5539 100644
--- a/sql/updates/world/2016_04_02_04_world_2016_01_19_04_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_04_world_2016_01_19_04_world.sql
diff --git a/sql/updates/world/2016_04_02_05_world_2016_01_19_05_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_05_world_2016_01_19_05_world.sql
index 5afd9e2b8a5..5afd9e2b8a5 100644
--- a/sql/updates/world/2016_04_02_05_world_2016_01_19_05_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_05_world_2016_01_19_05_world.sql
diff --git a/sql/updates/world/2016_04_02_06_world_2016_01_19_08_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_06_world_2016_01_19_08_world.sql
index d078c059201..d078c059201 100644
--- a/sql/updates/world/2016_04_02_06_world_2016_01_19_08_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_06_world_2016_01_19_08_world.sql
diff --git a/sql/updates/world/2016_04_02_07_world_2016_01_20_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_07_world_2016_01_20_00_world.sql
index 26ce069edd8..26ce069edd8 100644
--- a/sql/updates/world/2016_04_02_07_world_2016_01_20_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_07_world_2016_01_20_00_world.sql
diff --git a/sql/updates/world/2016_04_02_08_world_2016_01_20_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_08_world_2016_01_20_01_world.sql
index b1c6e0de756..b1c6e0de756 100644
--- a/sql/updates/world/2016_04_02_08_world_2016_01_20_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_08_world_2016_01_20_01_world.sql
diff --git a/sql/updates/world/2016_04_02_08_world_2016_01_20_02_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_08_world_2016_01_20_02_world.sql
index d026c3cb478..d026c3cb478 100644
--- a/sql/updates/world/2016_04_02_08_world_2016_01_20_02_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_08_world_2016_01_20_02_world.sql
diff --git a/sql/updates/world/2016_04_02_09_world_2016_01_23_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_09_world_2016_01_23_00_world.sql
index 64714570ff4..64714570ff4 100644
--- a/sql/updates/world/2016_04_02_09_world_2016_01_23_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_09_world_2016_01_23_00_world.sql
diff --git a/sql/updates/world/2016_04_02_10_world_2016_01_26_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_10_world_2016_01_26_00_world.sql
index 5af59382923..5af59382923 100644
--- a/sql/updates/world/2016_04_02_10_world_2016_01_26_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_10_world_2016_01_26_00_world.sql
diff --git a/sql/updates/world/2016_04_02_11_world_2016_01_31_32_world_335.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_11_world_2016_01_31_32_world_335.sql
index 64b32cb2d89..64b32cb2d89 100644
--- a/sql/updates/world/2016_04_02_11_world_2016_01_31_32_world_335.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_11_world_2016_01_31_32_world_335.sql
diff --git a/sql/updates/world/2016_04_02_12_world_2016_01_30_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_12_world_2016_01_30_01_world.sql
index e6d8ca7666b..e6d8ca7666b 100644
--- a/sql/updates/world/2016_04_02_12_world_2016_01_30_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_12_world_2016_01_30_01_world.sql
diff --git a/sql/updates/world/2016_04_02_13_world_2016_01_30_02_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_13_world_2016_01_30_02_world.sql
index 42c74662303..42c74662303 100644
--- a/sql/updates/world/2016_04_02_13_world_2016_01_30_02_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_13_world_2016_01_30_02_world.sql
diff --git a/sql/updates/world/2016_04_02_14_world_2016_01_30_03_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_14_world_2016_01_30_03_world.sql
index 06c4b0826c0..06c4b0826c0 100644
--- a/sql/updates/world/2016_04_02_14_world_2016_01_30_03_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_14_world_2016_01_30_03_world.sql
diff --git a/sql/updates/world/2016_04_02_15_world_2016_01_30_04_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_15_world_2016_01_30_04_world.sql
index b90e7b95810..b90e7b95810 100644
--- a/sql/updates/world/2016_04_02_15_world_2016_01_30_04_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_15_world_2016_01_30_04_world.sql
diff --git a/sql/updates/world/2016_04_02_16_world_2016_01_30_05_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_16_world_2016_01_30_05_world.sql
index 1e341506dfc..1e341506dfc 100644
--- a/sql/updates/world/2016_04_02_16_world_2016_01_30_05_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_16_world_2016_01_30_05_world.sql
diff --git a/sql/updates/world/2016_04_02_17_world_2016_01_31_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_17_world_2016_01_31_00_world.sql
index f64d9182784..f64d9182784 100644
--- a/sql/updates/world/2016_04_02_17_world_2016_01_31_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_17_world_2016_01_31_00_world.sql
diff --git a/sql/updates/world/2016_04_02_18_world_2016_01_31_15_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_18_world_2016_01_31_15_world.sql
index f1b181a29e3..f1b181a29e3 100644
--- a/sql/updates/world/2016_04_02_18_world_2016_01_31_15_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_18_world_2016_01_31_15_world.sql
diff --git a/sql/updates/world/2016_04_02_19_world_2016_02_04_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_19_world_2016_02_04_00_world.sql
index d222ff874c4..d222ff874c4 100644
--- a/sql/updates/world/2016_04_02_19_world_2016_02_04_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_19_world_2016_02_04_00_world.sql
diff --git a/sql/updates/world/2016_04_02_20_world_2016_01_09_toytrain.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_20_world_2016_01_09_toytrain.sql
index fc0b8a0cda0..fc0b8a0cda0 100644
--- a/sql/updates/world/2016_04_02_20_world_2016_01_09_toytrain.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_20_world_2016_01_09_toytrain.sql
diff --git a/sql/updates/world/2016_04_02_21_world_2016_02_06_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_21_world_2016_02_06_00_world.sql
index d303a8b5b85..d303a8b5b85 100644
--- a/sql/updates/world/2016_04_02_21_world_2016_02_06_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_21_world_2016_02_06_00_world.sql
diff --git a/sql/updates/world/2016_04_02_22_world_2016_02_06_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_22_world_2016_02_06_01_world.sql
index 6812c4af52e..6812c4af52e 100644
--- a/sql/updates/world/2016_04_02_22_world_2016_02_06_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_22_world_2016_02_06_01_world.sql
diff --git a/sql/updates/world/2016_04_02_23_world_2016_02_06_02_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_23_world_2016_02_06_02_world.sql
index b9fd7cd9d63..b9fd7cd9d63 100644
--- a/sql/updates/world/2016_04_02_23_world_2016_02_06_02_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_23_world_2016_02_06_02_world.sql
diff --git a/sql/updates/world/2016_04_02_24_world_2016_02_06_03_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_24_world_2016_02_06_03_world.sql
index 85f8d3c6ae7..85f8d3c6ae7 100644
--- a/sql/updates/world/2016_04_02_24_world_2016_02_06_03_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_24_world_2016_02_06_03_world.sql
diff --git a/sql/updates/world/2016_04_02_25_world_2016_02_06_04_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_25_world_2016_02_06_04_world.sql
index 188b3b5f2a7..188b3b5f2a7 100644
--- a/sql/updates/world/2016_04_02_25_world_2016_02_06_04_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_25_world_2016_02_06_04_world.sql
diff --git a/sql/updates/world/2016_04_02_26_world_2016_02_06_07_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_26_world_2016_02_06_07_world.sql
index c5d6434321a..c5d6434321a 100644
--- a/sql/updates/world/2016_04_02_26_world_2016_02_06_07_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_26_world_2016_02_06_07_world.sql
diff --git a/sql/updates/world/2016_04_02_27_world_2016_02_06_08_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_27_world_2016_02_06_08_world.sql
index f0855ba348a..f0855ba348a 100644
--- a/sql/updates/world/2016_04_02_27_world_2016_02_06_08_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_27_world_2016_02_06_08_world.sql
diff --git a/sql/updates/world/2016_04_02_28_world_2016_02_06_11_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_28_world_2016_02_06_11_world.sql
index cea352fec36..cea352fec36 100644
--- a/sql/updates/world/2016_04_02_28_world_2016_02_06_11_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_28_world_2016_02_06_11_world.sql
diff --git a/sql/updates/world/2016_04_02_29_world_2016_02_06_14_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_29_world_2016_02_06_14_world.sql
index 7bf05b61c71..7bf05b61c71 100644
--- a/sql/updates/world/2016_04_02_29_world_2016_02_06_14_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_29_world_2016_02_06_14_world.sql
diff --git a/sql/updates/world/2016_04_02_30_world_2016_02_07_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_30_world_2016_02_07_00_world.sql
index 5a49f8fd310..5a49f8fd310 100644
--- a/sql/updates/world/2016_04_02_30_world_2016_02_07_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_30_world_2016_02_07_00_world.sql
diff --git a/sql/updates/world/2016_04_02_31_world_2016_02_07_03_world_335.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_31_world_2016_02_07_03_world_335.sql
index b5557ebf771..b5557ebf771 100644
--- a/sql/updates/world/2016_04_02_31_world_2016_02_07_03_world_335.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_31_world_2016_02_07_03_world_335.sql
diff --git a/sql/updates/world/2016_04_02_32_world_2016_02_07_04_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_32_world_2016_02_07_04_world.sql
index 3a3a7a393d7..3a3a7a393d7 100644
--- a/sql/updates/world/2016_04_02_32_world_2016_02_07_04_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_32_world_2016_02_07_04_world.sql
diff --git a/sql/updates/world/2016_04_02_33_world_2016_02_07_05_world_335.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_33_world_2016_02_07_05_world_335.sql
index 794b3d80411..794b3d80411 100644
--- a/sql/updates/world/2016_04_02_33_world_2016_02_07_05_world_335.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_33_world_2016_02_07_05_world_335.sql
diff --git a/sql/updates/world/2016_04_02_34_world_2016_02_07_06_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_34_world_2016_02_07_06_world.sql
index 31ecf826660..31ecf826660 100644
--- a/sql/updates/world/2016_04_02_34_world_2016_02_07_06_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_34_world_2016_02_07_06_world.sql
diff --git a/sql/updates/world/2016_04_02_35_world_2016_02_07_09_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_35_world_2016_02_07_09_world.sql
index 8057534fbb8..8057534fbb8 100644
--- a/sql/updates/world/2016_04_02_35_world_2016_02_07_09_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_35_world_2016_02_07_09_world.sql
diff --git a/sql/updates/world/2016_04_02_36_world_2016_02_07_10_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_36_world_2016_02_07_10_world.sql
index e86b1de9bb2..e86b1de9bb2 100644
--- a/sql/updates/world/2016_04_02_36_world_2016_02_07_10_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_36_world_2016_02_07_10_world.sql
diff --git a/sql/updates/world/2016_04_02_37_world_2016_02_07_11_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_37_world_2016_02_07_11_world.sql
index c40b663c205..c40b663c205 100644
--- a/sql/updates/world/2016_04_02_37_world_2016_02_07_11_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_37_world_2016_02_07_11_world.sql
diff --git a/sql/updates/world/2016_04_02_38_world_2016_02_07_12_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_38_world_2016_02_07_12_world.sql
index c85265d857d..c85265d857d 100644
--- a/sql/updates/world/2016_04_02_38_world_2016_02_07_12_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_38_world_2016_02_07_12_world.sql
diff --git a/sql/updates/world/2016_04_02_39_world_2016_02_07_13_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_39_world_2016_02_07_13_world.sql
index 612fef2274d..612fef2274d 100644
--- a/sql/updates/world/2016_04_02_39_world_2016_02_07_13_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_39_world_2016_02_07_13_world.sql
diff --git a/sql/updates/world/2016_04_02_40_world_2016_02_07_14_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_40_world_2016_02_07_14_world.sql
index 6550e53f9c9..6550e53f9c9 100644
--- a/sql/updates/world/2016_04_02_40_world_2016_02_07_14_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_40_world_2016_02_07_14_world.sql
diff --git a/sql/updates/world/2016_04_02_41_world_2016_02_07_15_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_41_world_2016_02_07_15_world.sql
index 971b4d515d9..971b4d515d9 100644
--- a/sql/updates/world/2016_04_02_41_world_2016_02_07_15_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_41_world_2016_02_07_15_world.sql
diff --git a/sql/updates/world/2016_04_02_42_world_2016_02_08_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_42_world_2016_02_08_01_world.sql
index 9f8fa3dc4ed..9f8fa3dc4ed 100644
--- a/sql/updates/world/2016_04_02_42_world_2016_02_08_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_42_world_2016_02_08_01_world.sql
diff --git a/sql/updates/world/2016_04_02_43_world_2016_02_08_02_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_43_world_2016_02_08_02_world.sql
index 0f22abafe8e..0f22abafe8e 100644
--- a/sql/updates/world/2016_04_02_43_world_2016_02_08_02_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_43_world_2016_02_08_02_world.sql
diff --git a/sql/updates/world/2016_04_02_44_world_2016_02_08_03_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_44_world_2016_02_08_03_world.sql
index fe429cf42c8..fe429cf42c8 100644
--- a/sql/updates/world/2016_04_02_44_world_2016_02_08_03_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_44_world_2016_02_08_03_world.sql
diff --git a/sql/updates/world/2016_04_02_45_world_2016_02_08_05_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_45_world_2016_02_08_05_world.sql
index d2cc597a6ac..d2cc597a6ac 100644
--- a/sql/updates/world/2016_04_02_45_world_2016_02_08_05_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_45_world_2016_02_08_05_world.sql
diff --git a/sql/updates/world/2016_04_02_46_world_2016_02_08_07_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_46_world_2016_02_08_07_world.sql
index 1d90630d829..1d90630d829 100644
--- a/sql/updates/world/2016_04_02_46_world_2016_02_08_07_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_46_world_2016_02_08_07_world.sql
diff --git a/sql/updates/world/2016_04_02_47_world_2016_02_09_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_47_world_2016_02_09_00_world.sql
index c93a1d8fed1..c93a1d8fed1 100644
--- a/sql/updates/world/2016_04_02_47_world_2016_02_09_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_47_world_2016_02_09_00_world.sql
diff --git a/sql/updates/world/2016_04_02_48_world_2016_02_09_02_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_48_world_2016_02_09_02_world.sql
index 891c8c2ff4b..891c8c2ff4b 100644
--- a/sql/updates/world/2016_04_02_48_world_2016_02_09_02_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_48_world_2016_02_09_02_world.sql
diff --git a/sql/updates/world/2016_04_02_49_world_2016_02_09_04_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_49_world_2016_02_09_04_world.sql
index 015ab519557..015ab519557 100644
--- a/sql/updates/world/2016_04_02_49_world_2016_02_09_04_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_49_world_2016_02_09_04_world.sql
diff --git a/sql/updates/world/2016_04_02_50_world_2016_02_09_05_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_02_50_world_2016_02_09_05_world.sql
index 3612c270d02..3612c270d02 100644
--- a/sql/updates/world/2016_04_02_50_world_2016_02_09_05_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_02_50_world_2016_02_09_05_world.sql
diff --git a/sql/updates/world/2016_04_03_00_world_2016_04_02_02_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_03_00_world_2016_04_02_02_world.sql
index 89b8032be10..89b8032be10 100644
--- a/sql/updates/world/2016_04_03_00_world_2016_04_02_02_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_03_00_world_2016_04_02_02_world.sql
diff --git a/sql/updates/world/2016_04_03_01_world_2016_02_09_06_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_03_01_world_2016_02_09_06_world.sql
index 03fe998cca5..03fe998cca5 100644
--- a/sql/updates/world/2016_04_03_01_world_2016_02_09_06_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_03_01_world_2016_02_09_06_world.sql
diff --git a/sql/updates/world/2016_04_05_00_world_2016_02_09_07_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_05_00_world_2016_02_09_07_world.sql
index 84d65e2eda5..84d65e2eda5 100644
--- a/sql/updates/world/2016_04_05_00_world_2016_02_09_07_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_05_00_world_2016_02_09_07_world.sql
diff --git a/sql/updates/world/2016_04_05_01_world_2016_02_09_02_world_335.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_05_01_world_2016_02_09_02_world_335.sql
index 2ee78fe6b03..2ee78fe6b03 100644
--- a/sql/updates/world/2016_04_05_01_world_2016_02_09_02_world_335.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_05_01_world_2016_02_09_02_world_335.sql
diff --git a/sql/updates/world/2016_04_05_02_world_2016_02_09_08_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_05_02_world_2016_02_09_08_world.sql
index 307a9f9a0b3..307a9f9a0b3 100644
--- a/sql/updates/world/2016_04_05_02_world_2016_02_09_08_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_05_02_world_2016_02_09_08_world.sql
diff --git a/sql/updates/world/2016_04_05_03_world_2016_02_10_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_05_03_world_2016_02_10_01_world.sql
index 9ffe2e81c1c..9ffe2e81c1c 100644
--- a/sql/updates/world/2016_04_05_03_world_2016_02_10_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_05_03_world_2016_02_10_01_world.sql
diff --git a/sql/updates/world/2016_04_05_04_world_2016_02_10_02_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_05_04_world_2016_02_10_02_world.sql
index 92ee165dd83..92ee165dd83 100644
--- a/sql/updates/world/2016_04_05_04_world_2016_02_10_02_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_05_04_world_2016_02_10_02_world.sql
diff --git a/sql/updates/world/2016_04_05_05_world_2016_02_10_04_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_05_05_world_2016_02_10_04_world.sql
index a4fb9987c6a..a4fb9987c6a 100644
--- a/sql/updates/world/2016_04_05_05_world_2016_02_10_04_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_05_05_world_2016_02_10_04_world.sql
diff --git a/sql/updates/world/2016_04_05_05_world_2016_02_10_05_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_05_05_world_2016_02_10_05_world.sql
index c19dd8feb06..c19dd8feb06 100644
--- a/sql/updates/world/2016_04_05_05_world_2016_02_10_05_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_05_05_world_2016_02_10_05_world.sql
diff --git a/sql/updates/world/2016_04_05_06_world_2016_02_10_06_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_05_06_world_2016_02_10_06_world.sql
index 9e24ab31ce1..9e24ab31ce1 100644
--- a/sql/updates/world/2016_04_05_06_world_2016_02_10_06_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_05_06_world_2016_02_10_06_world.sql
diff --git a/sql/updates/world/2016_04_05_07_world_2016_02_10_07_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_05_07_world_2016_02_10_07_world.sql
index 5feb4f44163..5feb4f44163 100644
--- a/sql/updates/world/2016_04_05_07_world_2016_02_10_07_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_05_07_world_2016_02_10_07_world.sql
diff --git a/sql/updates/world/2016_04_05_08_world_2016_02_11_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_05_08_world_2016_02_11_01_world.sql
index ec1c98659e1..ec1c98659e1 100644
--- a/sql/updates/world/2016_04_05_08_world_2016_02_11_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_05_08_world_2016_02_11_01_world.sql
diff --git a/sql/updates/world/2016_04_05_09_world_2016_02_11_02_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_05_09_world_2016_02_11_02_world.sql
index 9228e2d99d7..9228e2d99d7 100644
--- a/sql/updates/world/2016_04_05_09_world_2016_02_11_02_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_05_09_world_2016_02_11_02_world.sql
diff --git a/sql/updates/world/2016_04_05_10_world_2016_02_11_03_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_05_10_world_2016_02_11_03_world.sql
index 4dfefb12281..4dfefb12281 100644
--- a/sql/updates/world/2016_04_05_10_world_2016_02_11_03_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_05_10_world_2016_02_11_03_world.sql
diff --git a/sql/updates/world/2016_04_05_11_world_2016_02_11_05_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_05_11_world_2016_02_11_05_world.sql
index 76b59765d08..76b59765d08 100644
--- a/sql/updates/world/2016_04_05_11_world_2016_02_11_05_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_05_11_world_2016_02_11_05_world.sql
diff --git a/sql/updates/world/2016_04_05_12_world_2016_02_11_06_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_05_12_world_2016_02_11_06_world.sql
index 6570de753d8..6570de753d8 100644
--- a/sql/updates/world/2016_04_05_12_world_2016_02_11_06_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_05_12_world_2016_02_11_06_world.sql
diff --git a/sql/updates/world/2016_04_05_13_world_2016_02_11_07_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_05_13_world_2016_02_11_07_world.sql
index 34bbab1766b..34bbab1766b 100644
--- a/sql/updates/world/2016_04_05_13_world_2016_02_11_07_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_05_13_world_2016_02_11_07_world.sql
diff --git a/sql/updates/world/2016_04_05_14_world_2016_02_13_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_05_14_world_2016_02_13_00_world.sql
index 2341e33a8b5..2341e33a8b5 100644
--- a/sql/updates/world/2016_04_05_14_world_2016_02_13_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_05_14_world_2016_02_13_00_world.sql
diff --git a/sql/updates/world/2016_04_05_15_world_2016_02_13_03_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_05_15_world_2016_02_13_03_world.sql
index 4b8fca083e8..4b8fca083e8 100644
--- a/sql/updates/world/2016_04_05_15_world_2016_02_13_03_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_05_15_world_2016_02_13_03_world.sql
diff --git a/sql/updates/world/2016_04_08_00_world_2016_02_13_04_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_08_00_world_2016_02_13_04_world.sql
index 83d95745052..83d95745052 100644
--- a/sql/updates/world/2016_04_08_00_world_2016_02_13_04_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_08_00_world_2016_02_13_04_world.sql
diff --git a/sql/updates/world/2016_04_08_01_world_2016_02_14_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_08_01_world_2016_02_14_00_world.sql
index f1f35431c54..f1f35431c54 100644
--- a/sql/updates/world/2016_04_08_01_world_2016_02_14_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_08_01_world_2016_02_14_00_world.sql
diff --git a/sql/updates/world/2016_04_08_02_world_2016_02_14_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_08_02_world_2016_02_14_01_world.sql
index 2ce06020621..2ce06020621 100644
--- a/sql/updates/world/2016_04_08_02_world_2016_02_14_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_08_02_world_2016_02_14_01_world.sql
diff --git a/sql/updates/world/2016_04_08_03_world_2016_02_14_02_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_08_03_world_2016_02_14_02_world.sql
index 1459b702cf0..1459b702cf0 100644
--- a/sql/updates/world/2016_04_08_03_world_2016_02_14_02_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_08_03_world_2016_02_14_02_world.sql
diff --git a/sql/updates/world/2016_04_08_04_world_2016_02_14_03_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_08_04_world_2016_02_14_03_world.sql
index 9a0237725c0..9a0237725c0 100644
--- a/sql/updates/world/2016_04_08_04_world_2016_02_14_03_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_08_04_world_2016_02_14_03_world.sql
diff --git a/sql/updates/world/2016_04_08_05_world_2016_02_14_04_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_08_05_world_2016_02_14_04_world.sql
index 58e0aaee311..58e0aaee311 100644
--- a/sql/updates/world/2016_04_08_05_world_2016_02_14_04_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_08_05_world_2016_02_14_04_world.sql
diff --git a/sql/updates/world/2016_04_08_06_world_2016_02_15_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_08_06_world_2016_02_15_00_world.sql
index 43c2ae69382..43c2ae69382 100644
--- a/sql/updates/world/2016_04_08_06_world_2016_02_15_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_08_06_world_2016_02_15_00_world.sql
diff --git a/sql/updates/world/2016_04_08_07_world_2016_02_17_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_08_07_world_2016_02_17_00_world.sql
index 8f22aaa3e4e..8f22aaa3e4e 100644
--- a/sql/updates/world/2016_04_08_07_world_2016_02_17_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_08_07_world_2016_02_17_00_world.sql
diff --git a/sql/updates/world/2016_04_08_08_world_2016_02_17_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_08_08_world_2016_02_17_01_world.sql
index 20f3605b197..20f3605b197 100644
--- a/sql/updates/world/2016_04_08_08_world_2016_02_17_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_08_08_world_2016_02_17_01_world.sql
diff --git a/sql/updates/world/2016_04_08_09_world_2016_02_17_02_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_08_09_world_2016_02_17_02_world.sql
index 6590396b7d9..6590396b7d9 100644
--- a/sql/updates/world/2016_04_08_09_world_2016_02_17_02_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_08_09_world_2016_02_17_02_world.sql
diff --git a/sql/updates/world/2016_04_08_10_world_2016_02_18_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_08_10_world_2016_02_18_01_world.sql
index c3ffdbb6344..c3ffdbb6344 100644
--- a/sql/updates/world/2016_04_08_10_world_2016_02_18_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_08_10_world_2016_02_18_01_world.sql
diff --git a/sql/updates/world/2016_04_08_11_world_2016_02_18_02_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_08_11_world_2016_02_18_02_world.sql
index 414c6fd9c3a..414c6fd9c3a 100644
--- a/sql/updates/world/2016_04_08_11_world_2016_02_18_02_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_08_11_world_2016_02_18_02_world.sql
diff --git a/sql/updates/world/2016_04_08_12_world_2016_02_19_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_08_12_world_2016_02_19_00_world.sql
index bee93f7bdd4..bee93f7bdd4 100644
--- a/sql/updates/world/2016_04_08_12_world_2016_02_19_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_08_12_world_2016_02_19_00_world.sql
diff --git a/sql/updates/world/2016_04_08_13_world_2016_02_22_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_08_13_world_2016_02_22_00_world.sql
index d92ea91681a..d92ea91681a 100644
--- a/sql/updates/world/2016_04_08_13_world_2016_02_22_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_08_13_world_2016_02_22_00_world.sql
diff --git a/sql/updates/world/2016_04_08_14_world_2016_02_22_02_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_08_14_world_2016_02_22_02_world.sql
index cd768e06561..cd768e06561 100644
--- a/sql/updates/world/2016_04_08_14_world_2016_02_22_02_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_08_14_world_2016_02_22_02_world.sql
diff --git a/sql/updates/world/2016_04_08_15_world_2016_02_23_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_08_15_world_2016_02_23_00_world.sql
index 871ce608f1c..871ce608f1c 100644
--- a/sql/updates/world/2016_04_08_15_world_2016_02_23_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_08_15_world_2016_02_23_00_world.sql
diff --git a/sql/updates/world/2016_04_08_16_world_2016_02_23_02_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_08_16_world_2016_02_23_02_world.sql
index 9e2c550dd65..9e2c550dd65 100644
--- a/sql/updates/world/2016_04_08_16_world_2016_02_23_02_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_08_16_world_2016_02_23_02_world.sql
diff --git a/sql/updates/world/2016_04_08_17_world_2016_02_25_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_08_17_world_2016_02_25_00_world.sql
index 346c77bee43..346c77bee43 100644
--- a/sql/updates/world/2016_04_08_17_world_2016_02_25_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_08_17_world_2016_02_25_00_world.sql
diff --git a/sql/updates/world/2016_04_08_18_world_2016_02_25_01_world_335.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_08_18_world_2016_02_25_01_world_335.sql
index 03e8517e9f0..03e8517e9f0 100644
--- a/sql/updates/world/2016_04_08_18_world_2016_02_25_01_world_335.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_08_18_world_2016_02_25_01_world_335.sql
diff --git a/sql/updates/world/2016_04_08_19_world_2016_02_25_02_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_08_19_world_2016_02_25_02_world.sql
index e17e716012c..e17e716012c 100644
--- a/sql/updates/world/2016_04_08_19_world_2016_02_25_02_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_08_19_world_2016_02_25_02_world.sql
diff --git a/sql/updates/world/2016_04_08_20_world_2016_02_26_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_08_20_world_2016_02_26_00_world.sql
index d08d5055089..d08d5055089 100644
--- a/sql/updates/world/2016_04_08_20_world_2016_02_26_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_08_20_world_2016_02_26_00_world.sql
diff --git a/sql/updates/world/2016_04_08_21_world_2016_02_26_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_08_21_world_2016_02_26_01_world.sql
index b30b3cba35f..b30b3cba35f 100644
--- a/sql/updates/world/2016_04_08_21_world_2016_02_26_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_08_21_world_2016_02_26_01_world.sql
diff --git a/sql/updates/world/2016_04_08_22_world_2016_02_27_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_08_22_world_2016_02_27_00_world.sql
index b9288b2ddfb..b9288b2ddfb 100644
--- a/sql/updates/world/2016_04_08_22_world_2016_02_27_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_08_22_world_2016_02_27_00_world.sql
diff --git a/sql/updates/world/2016_04_08_23_world_2016_03_03_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_08_23_world_2016_03_03_00_world.sql
index 3f150f4e7fb..3f150f4e7fb 100644
--- a/sql/updates/world/2016_04_08_23_world_2016_03_03_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_08_23_world_2016_03_03_00_world.sql
diff --git a/sql/updates/world/2016_04_08_24_world_2016_03_03_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_08_24_world_2016_03_03_01_world.sql
index 119f38cd2eb..119f38cd2eb 100644
--- a/sql/updates/world/2016_04_08_24_world_2016_03_03_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_08_24_world_2016_03_03_01_world.sql
diff --git a/sql/updates/world/2016_04_08_25_world_2016_03_04_03_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_08_25_world_2016_03_04_03_world.sql
index 4d148adde55..4d148adde55 100644
--- a/sql/updates/world/2016_04_08_25_world_2016_03_04_03_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_08_25_world_2016_03_04_03_world.sql
diff --git a/sql/updates/world/2016_04_08_26_world_2016_03_05_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_08_26_world_2016_03_05_00_world.sql
index 8dde060140d..8dde060140d 100644
--- a/sql/updates/world/2016_04_08_26_world_2016_03_05_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_08_26_world_2016_03_05_00_world.sql
diff --git a/sql/updates/world/2016_04_09_00_world_2016_03_06_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_00_world_2016_03_06_00_world.sql
index 85949288373..85949288373 100644
--- a/sql/updates/world/2016_04_09_00_world_2016_03_06_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_00_world_2016_03_06_00_world.sql
diff --git a/sql/updates/world/2016_04_09_01_world_2016_03_06_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_01_world_2016_03_06_01_world.sql
index 183121d6735..183121d6735 100644
--- a/sql/updates/world/2016_04_09_01_world_2016_03_06_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_01_world_2016_03_06_01_world.sql
diff --git a/sql/updates/world/2016_04_09_02_world_2016_03_07_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_02_world_2016_03_07_00_world.sql
index 4557fc0c72b..4557fc0c72b 100644
--- a/sql/updates/world/2016_04_09_02_world_2016_03_07_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_02_world_2016_03_07_00_world.sql
diff --git a/sql/updates/world/2016_04_09_03_world_2016_03_09_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_03_world_2016_03_09_00_world.sql
index 125414cb908..125414cb908 100644
--- a/sql/updates/world/2016_04_09_03_world_2016_03_09_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_03_world_2016_03_09_00_world.sql
diff --git a/sql/updates/world/2016_04_09_04_world_2016_03_13_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_04_world_2016_03_13_00_world.sql
index 0c45636d945..0c45636d945 100644
--- a/sql/updates/world/2016_04_09_04_world_2016_03_13_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_04_world_2016_03_13_00_world.sql
diff --git a/sql/updates/world/2016_04_09_05_world_2016_03_13_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_05_world_2016_03_13_01_world.sql
index 12bc205f125..12bc205f125 100644
--- a/sql/updates/world/2016_04_09_05_world_2016_03_13_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_05_world_2016_03_13_01_world.sql
diff --git a/sql/updates/world/2016_04_09_06_world_2016_03_15_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_06_world_2016_03_15_00_world.sql
index 69e2e3a873b..69e2e3a873b 100644
--- a/sql/updates/world/2016_04_09_06_world_2016_03_15_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_06_world_2016_03_15_00_world.sql
diff --git a/sql/updates/world/2016_04_09_07_world_2016_03_19_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_07_world_2016_03_19_00_world.sql
index 7a4ec89143f..7a4ec89143f 100644
--- a/sql/updates/world/2016_04_09_07_world_2016_03_19_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_07_world_2016_03_19_00_world.sql
diff --git a/sql/updates/world/2016_04_09_08_world_2016_03_19_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_08_world_2016_03_19_01_world.sql
index 79452fdf43c..79452fdf43c 100644
--- a/sql/updates/world/2016_04_09_08_world_2016_03_19_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_08_world_2016_03_19_01_world.sql
diff --git a/sql/updates/world/2016_04_09_09_world_2016_03_19_02_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_09_world_2016_03_19_02_world.sql
index a0a6ff3619c..a0a6ff3619c 100644
--- a/sql/updates/world/2016_04_09_09_world_2016_03_19_02_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_09_world_2016_03_19_02_world.sql
diff --git a/sql/updates/world/2016_04_09_10_world_2016_03_20_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_10_world_2016_03_20_00_world.sql
index 8120f1be86f..8120f1be86f 100644
--- a/sql/updates/world/2016_04_09_10_world_2016_03_20_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_10_world_2016_03_20_00_world.sql
diff --git a/sql/updates/world/2016_04_09_11_world_2016_03_21_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_11_world_2016_03_21_00_world.sql
index 8cc0a06f06e..8cc0a06f06e 100644
--- a/sql/updates/world/2016_04_09_11_world_2016_03_21_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_11_world_2016_03_21_00_world.sql
diff --git a/sql/updates/world/2016_04_09_12_world_2016_03_24_02_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_12_world_2016_03_24_02_world.sql
index 199582eb4a0..199582eb4a0 100644
--- a/sql/updates/world/2016_04_09_12_world_2016_03_24_02_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_12_world_2016_03_24_02_world.sql
diff --git a/sql/updates/world/2016_04_09_13_world_2016_03_26_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_13_world_2016_03_26_00_world.sql
index 58a42dc214d..58a42dc214d 100644
--- a/sql/updates/world/2016_04_09_13_world_2016_03_26_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_13_world_2016_03_26_00_world.sql
diff --git a/sql/updates/world/2016_04_09_14_world_2016_03_27_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_14_world_2016_03_27_00_world.sql
index 9421881c88a..9421881c88a 100644
--- a/sql/updates/world/2016_04_09_14_world_2016_03_27_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_14_world_2016_03_27_00_world.sql
diff --git a/sql/updates/world/2016_04_09_15_world_2016_03_28_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_15_world_2016_03_28_00_world.sql
index b4a7e2d5a36..b4a7e2d5a36 100644
--- a/sql/updates/world/2016_04_09_15_world_2016_03_28_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_15_world_2016_03_28_00_world.sql
diff --git a/sql/updates/world/2016_04_09_16_world_2016_03_28_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_16_world_2016_03_28_01_world.sql
index b4a24b011b3..b4a24b011b3 100644
--- a/sql/updates/world/2016_04_09_16_world_2016_03_28_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_16_world_2016_03_28_01_world.sql
diff --git a/sql/updates/world/2016_04_09_17_world_2016_04_01_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_17_world_2016_04_01_00_world.sql
index 024bbb6fa5a..024bbb6fa5a 100644
--- a/sql/updates/world/2016_04_09_17_world_2016_04_01_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_17_world_2016_04_01_00_world.sql
diff --git a/sql/updates/world/2016_04_09_18_world_2016_04_01_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_18_world_2016_04_01_01_world.sql
index 38a13f0ea84..38a13f0ea84 100644
--- a/sql/updates/world/2016_04_09_18_world_2016_04_01_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_18_world_2016_04_01_01_world.sql
diff --git a/sql/updates/world/2016_04_09_19_world_2016_04_02_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_19_world_2016_04_02_00_world.sql
index dc8f4375da0..dc8f4375da0 100644
--- a/sql/updates/world/2016_04_09_19_world_2016_04_02_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_19_world_2016_04_02_00_world.sql
diff --git a/sql/updates/world/2016_04_09_20_world_2016_04_02_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_20_world_2016_04_02_01_world.sql
index 4bcca1d6250..4bcca1d6250 100644
--- a/sql/updates/world/2016_04_09_20_world_2016_04_02_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_20_world_2016_04_02_01_world.sql
diff --git a/sql/updates/world/2016_04_09_21_world_2016_04_03_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_21_world_2016_04_03_00_world.sql
index 8344df664f2..8344df664f2 100644
--- a/sql/updates/world/2016_04_09_21_world_2016_04_03_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_21_world_2016_04_03_00_world.sql
diff --git a/sql/updates/world/2016_04_09_22_world_2016_04_03_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_22_world_2016_04_03_01_world.sql
index a150fe2d69e..a150fe2d69e 100644
--- a/sql/updates/world/2016_04_09_22_world_2016_04_03_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_22_world_2016_04_03_01_world.sql
diff --git a/sql/updates/world/2016_04_09_23_world_2016_04_03_02_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_23_world_2016_04_03_02_world.sql
index 1a408d3ec6a..1a408d3ec6a 100644
--- a/sql/updates/world/2016_04_09_23_world_2016_04_03_02_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_23_world_2016_04_03_02_world.sql
diff --git a/sql/updates/world/2016_04_09_24_world_2016_04_04_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_24_world_2016_04_04_00_world.sql
index 69da8a7d699..69da8a7d699 100644
--- a/sql/updates/world/2016_04_09_24_world_2016_04_04_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_24_world_2016_04_04_00_world.sql
diff --git a/sql/updates/world/2016_04_09_25_world_2016_04_05_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_25_world_2016_04_05_00_world.sql
index 88aea9d39a0..88aea9d39a0 100644
--- a/sql/updates/world/2016_04_09_25_world_2016_04_05_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_25_world_2016_04_05_00_world.sql
diff --git a/sql/updates/world/2016_04_09_26_world_2016_04_05_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_26_world_2016_04_05_01_world.sql
index eb2609af74d..eb2609af74d 100644
--- a/sql/updates/world/2016_04_09_26_world_2016_04_05_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_26_world_2016_04_05_01_world.sql
diff --git a/sql/updates/world/2016_04_09_27_world_2016_04_08_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_27_world_2016_04_08_00_world.sql
index 85942e7c5e3..85942e7c5e3 100644
--- a/sql/updates/world/2016_04_09_27_world_2016_04_08_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_27_world_2016_04_08_00_world.sql
diff --git a/sql/updates/world/2016_04_09_28_world_2016_04_09_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_28_world_2016_04_09_01_world.sql
index 0c01492d746..0c01492d746 100644
--- a/sql/updates/world/2016_04_09_28_world_2016_04_09_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_28_world_2016_04_09_01_world.sql
diff --git a/sql/updates/world/2016_04_09_29_world_2016_04_09_03_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_29_world_2016_04_09_03_world.sql
index 732e3d83ee5..732e3d83ee5 100644
--- a/sql/updates/world/2016_04_09_29_world_2016_04_09_03_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_29_world_2016_04_09_03_world.sql
diff --git a/sql/updates/world/2016_04_09_30_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_30_world.sql
index 01154d2070a..01154d2070a 100644
--- a/sql/updates/world/2016_04_09_30_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_30_world.sql
diff --git a/sql/updates/world/2016_04_09_31_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_31_world.sql
index 95210f1ae5f..95210f1ae5f 100644
--- a/sql/updates/world/2016_04_09_31_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_31_world.sql
diff --git a/sql/updates/world/2016_04_09_32_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_32_world.sql
index f1e0df03eec..f1e0df03eec 100644
--- a/sql/updates/world/2016_04_09_32_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_32_world.sql
diff --git a/sql/updates/world/2016_04_09_33_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_33_world.sql
index 2899c6e06eb..2899c6e06eb 100644
--- a/sql/updates/world/2016_04_09_33_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_33_world.sql
diff --git a/sql/updates/world/2016_04_09_34_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_34_world.sql
index f9bd6b67ab0..f9bd6b67ab0 100644
--- a/sql/updates/world/2016_04_09_34_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_34_world.sql
diff --git a/sql/updates/world/2016_04_09_35_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_35_world.sql
index 3dd2901efe3..3dd2901efe3 100644
--- a/sql/updates/world/2016_04_09_35_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_35_world.sql
diff --git a/sql/updates/world/2016_04_09_36_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_36_world.sql
index 50657b26857..50657b26857 100644
--- a/sql/updates/world/2016_04_09_36_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_36_world.sql
diff --git a/sql/updates/world/2016_04_09_37_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_37_world.sql
index 1c98dd3186c..1c98dd3186c 100644
--- a/sql/updates/world/2016_04_09_37_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_37_world.sql
diff --git a/sql/updates/world/2016_04_09_38_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_38_world.sql
index a8dfbfe373f..a8dfbfe373f 100644
--- a/sql/updates/world/2016_04_09_38_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_38_world.sql
diff --git a/sql/updates/world/2016_04_09_39_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_39_world.sql
index cea9ca4f272..cea9ca4f272 100644
--- a/sql/updates/world/2016_04_09_39_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_39_world.sql
diff --git a/sql/updates/world/2016_04_09_40_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_40_world.sql
index 630262d4f7a..630262d4f7a 100644
--- a/sql/updates/world/2016_04_09_40_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_40_world.sql
diff --git a/sql/updates/world/2016_04_09_41_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_41_world.sql
index e4e9f44cd24..e4e9f44cd24 100644
--- a/sql/updates/world/2016_04_09_41_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_41_world.sql
diff --git a/sql/updates/world/2016_04_09_42_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_09_42_world.sql
index 5a4633fee41..5a4633fee41 100644
--- a/sql/updates/world/2016_04_09_42_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_09_42_world.sql
diff --git a/sql/updates/world/2016_04_10_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_10_00_world.sql
index 0b17cf4d8eb..0b17cf4d8eb 100644
--- a/sql/updates/world/2016_04_10_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_10_00_world.sql
diff --git a/sql/updates/world/2016_04_10_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_10_01_world.sql
index fec4242b319..fec4242b319 100644
--- a/sql/updates/world/2016_04_10_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_10_01_world.sql
diff --git a/sql/updates/world/2016_04_10_02_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_10_02_world.sql
index 1aecae16062..1aecae16062 100644
--- a/sql/updates/world/2016_04_10_02_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_10_02_world.sql
diff --git a/sql/updates/world/2016_04_10_03_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_10_03_world.sql
index 281f38db3c1..281f38db3c1 100644
--- a/sql/updates/world/2016_04_10_03_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_10_03_world.sql
diff --git a/sql/updates/world/2016_04_10_04_world_2015_11_22_02_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_10_04_world_2015_11_22_02_world.sql
index 6441f740218..6441f740218 100644
--- a/sql/updates/world/2016_04_10_04_world_2015_11_22_02_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_10_04_world_2015_11_22_02_world.sql
diff --git a/sql/updates/world/2016_04_10_05_world_2015_11_27_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_10_05_world_2015_11_27_00_world.sql
index 2c243424e9f..2c243424e9f 100644
--- a/sql/updates/world/2016_04_10_05_world_2015_11_27_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_10_05_world_2015_11_27_00_world.sql
diff --git a/sql/updates/world/2016_04_10_06_world_2016_01_17_05_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_10_06_world_2016_01_17_05_world.sql
index 081b0147b3c..081b0147b3c 100644
--- a/sql/updates/world/2016_04_10_06_world_2016_01_17_05_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_10_06_world_2016_01_17_05_world.sql
diff --git a/sql/updates/world/2016_04_10_07_world_2016_01_17_11_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_10_07_world_2016_01_17_11_world.sql
index 9ab963a2ff2..9ab963a2ff2 100644
--- a/sql/updates/world/2016_04_10_07_world_2016_01_17_11_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_10_07_world_2016_01_17_11_world.sql
diff --git a/sql/updates/world/2016_04_10_08_world_2016_01_19_06_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_10_08_world_2016_01_19_06_world.sql
index 54682bfbdff..54682bfbdff 100644
--- a/sql/updates/world/2016_04_10_08_world_2016_01_19_06_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_10_08_world_2016_01_19_06_world.sql
diff --git a/sql/updates/world/2016_04_10_09_world_2016_01_19_07_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_10_09_world_2016_01_19_07_world.sql
index 3cb7abc618e..3cb7abc618e 100644
--- a/sql/updates/world/2016_04_10_09_world_2016_01_19_07_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_10_09_world_2016_01_19_07_world.sql
diff --git a/sql/updates/world/2016_04_10_10_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_10_10_world.sql
index 8ed1aaebaff..8ed1aaebaff 100644
--- a/sql/updates/world/2016_04_10_10_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_10_10_world.sql
diff --git a/sql/updates/world/2016_04_10_11_world_2016_02_22_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_10_11_world_2016_02_22_01_world.sql
index a750d8d3894..a750d8d3894 100644
--- a/sql/updates/world/2016_04_10_11_world_2016_02_22_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_10_11_world_2016_02_22_01_world.sql
diff --git a/sql/updates/world/2016_04_10_12_world_2016_03_20_01_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_10_12_world_2016_03_20_01_world.sql
index d759a81cc1d..d759a81cc1d 100644
--- a/sql/updates/world/2016_04_10_12_world_2016_03_20_01_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_10_12_world_2016_03_20_01_world.sql
diff --git a/sql/updates/world/2016_04_10_13_world_2016_03_23_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_10_13_world_2016_03_23_00_world.sql
index 536d5de7446..536d5de7446 100644
--- a/sql/updates/world/2016_04_10_13_world_2016_03_23_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_10_13_world_2016_03_23_00_world.sql
diff --git a/sql/updates/world/2016_04_10_14_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_10_14_world.sql
index 7ecd268e2d3..7ecd268e2d3 100644
--- a/sql/updates/world/2016_04_10_14_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_10_14_world.sql
diff --git a/sql/updates/world/2016_04_10_15_world_2016_04_10_00_world.sql b/sql/old/6.x/world/03_2016_04_11/2016_04_10_15_world_2016_04_10_00_world.sql
index d5c24c4a65d..d5c24c4a65d 100644
--- a/sql/updates/world/2016_04_10_15_world_2016_04_10_00_world.sql
+++ b/sql/old/6.x/world/03_2016_04_11/2016_04_10_15_world_2016_04_10_00_world.sql
diff --git a/sql/updates/auth/2016_04_11_00_auth.sql b/sql/updates/auth/2016_04_11_00_auth.sql
new file mode 100644
index 00000000000..be8a4d21b66
--- /dev/null
+++ b/sql/updates/auth/2016_04_11_00_auth.sql
@@ -0,0 +1 @@
+UPDATE `updates` SET `state`='ARCHIVED';
diff --git a/sql/updates/characters/2016_04_11_00_characters.sql b/sql/updates/characters/2016_04_11_00_characters.sql
new file mode 100644
index 00000000000..be8a4d21b66
--- /dev/null
+++ b/sql/updates/characters/2016_04_11_00_characters.sql
@@ -0,0 +1 @@
+UPDATE `updates` SET `state`='ARCHIVED';
diff --git a/sql/updates/hotfixes/2016_04_11_00_hotfixes.sql b/sql/updates/hotfixes/2016_04_11_00_hotfixes.sql
new file mode 100644
index 00000000000..be8a4d21b66
--- /dev/null
+++ b/sql/updates/hotfixes/2016_04_11_00_hotfixes.sql
@@ -0,0 +1 @@
+UPDATE `updates` SET `state`='ARCHIVED';
diff --git a/sql/updates/world/2016_04_11_00_world.sql b/sql/updates/world/2016_04_11_00_world.sql
new file mode 100644
index 00000000000..ce23f38b840
--- /dev/null
+++ b/sql/updates/world/2016_04_11_00_world.sql
@@ -0,0 +1,3 @@
+UPDATE `version` SET `db_version`='TDB 6.04', `cache_id`=4 LIMIT 1;
+
+UPDATE `updates` SET `state`='ARCHIVED';