521 files changed, 60 insertions, 61 deletions

diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
index ef34e0fab7b..9332bc24dfd 100644
--- a/sql/base/auth_database.sql
+++ b/sql/base/auth_database.sql
@@ -375,7 +375,7 @@ CREATE TABLE `rbac_linked_permissions` (
 
 LOCK TABLES `rbac_linked_permissions` WRITE;
 /*!40000 ALTER TABLE `rbac_linked_permissions` DISABLE KEYS */;
-INSERT INTO `rbac_linked_permissions` VALUES (192,21),(192,42),(192,43),(192,193),(192,196),(192,778),(192,779),(192,780),(192,781),(192,782),(192,783),(192,784),(192,785),(192,786),(192,787),(192,788),(192,789),(192,790),(192,791),(192,792),(192,793),(192,794),(192,795),(192,796),(192,835),(193,48),(193,194),(193,197),(194,1),(194,2),(194,11),(194,13),(194,14),(194,15),(194,16),(194,17),(194,18),(194,19),(194,20),(194,22),(194,23),(194,25),(194,26),(194,27),(194,28),(194,29),(194,30),(194,31),(194,32),(194,33),(194,34),(194,35),(194,36),(194,37),(194,38),(194,39),(194,40),(194,41),(194,44),(194,46),(194,47),(194,51),(194,195),(194,198),(194,632),(194,798),(195,3),(195,4),(195,5),(195,6),(195,24),(195,49),(195,199),(196,200),(196,201),(196,226),(196,227),(196,230),(196,231),(196,233),(196,234),(196,235),(196,238),(196,239),(196,240),(196,241),(196,242),(196,243),(196,244),(196,245),(196,246),(196,247),(196,248),(196,249),(196,250),(196,251),(196,252),(196,253),(196,254),(196,255),(196,256),(196,257),(196,258),(196,259),(196,260),(196,261),(196,262),(196,264),(196,265),(196,266),(196,267),(196,268),(196,269),(196,270),(196,271),(196,272),(196,279),(196,280),(196,283),(196,287),(196,288),(196,289),(196,290),(196,291),(196,292),(196,293),(196,294),(196,295),(196,296),(196,297),(196,298),(196,299),(196,302),(196,303),(196,304),(196,305),(196,306),(196,307),(196,308),(196,309),(196,310),(196,313),(196,314),(196,319),(196,320),(196,321),(196,322),(196,323),(196,324),(196,325),(196,326),(196,327),(196,328),(196,329),(196,330),(196,331),(196,332),(196,333),(196,334),(196,335),(196,336),(196,337),(196,338),(196,339),(196,340),(196,341),(196,342),(196,343),(196,344),(196,345),(196,346),(196,347),(196,348),(196,349),(196,350),(196,351),(196,352),(196,353),(196,354),(196,355),(196,356),(196,357),(196,358),(196,359),(196,360),(196,361),(196,362),(196,363),(196,364),(196,365),(196,366),(196,373),(196,375),(196,400),(196,401),(196,402),(196,403),(196,404),(196,405),(196,406),(196,407),(196,417),(196,418),(196,419),(196,420),(196,421),(196,422),(196,423),(196,424),(196,425),(196,426),(196,427),(196,428),(196,429),(196,434),(196,435),(196,436),(196,437),(196,438),(196,439),(196,440),(196,441),(196,442),(196,443),(196,444),(196,445),(196,446),(196,447),(196,448),(196,449),(196,450),(196,451),(196,452),(196,453),(196,454),(196,455),(196,456),(196,457),(196,458),(196,459),(196,461),(196,463),(196,464),(196,465),(196,472),(196,473),(196,474),(196,475),(196,476),(196,477),(196,478),(196,488),(196,489),(196,491),(196,492),(196,493),(196,495),(196,497),(196,498),(196,499),(196,500),(196,502),(196,503),(196,505),(196,508),(196,511),(196,513),(196,514),(196,516),(196,519),(196,522),(196,523),(196,526),(196,527),(196,529),(196,530),(196,533),(196,535),(196,536),(196,537),(196,538),(196,539),(196,540),(196,541),(196,556),(196,581),(196,582),(196,592),(196,593),(196,596),(196,602),(196,603),(196,604),(196,605),(196,606),(196,607),(196,608),(196,609),(196,610),(196,611),(196,612),(196,613),(196,614),(196,615),(196,616),(196,617),(196,618),(196,619),(196,620),(196,621),(196,622),(196,623),(196,624),(196,625),(196,626),(196,627),(196,628),(196,629),(196,630),(196,631),(196,633),(196,634),(196,635),(196,636),(196,637),(196,638),(196,639),(196,640),(196,641),(196,642),(196,643),(196,644),(196,645),(196,646),(196,647),(196,648),(196,649),(196,650),(196,651),(196,652),(196,653),(196,654),(196,655),(196,656),(196,657),(196,658),(196,659),(196,660),(196,661),(196,662),(196,663),(196,664),(196,665),(196,666),(196,667),(196,668),(196,669),(196,670),(196,671),(196,672),(196,673),(196,674),(196,675),(196,676),(196,677),(196,678),(196,679),(196,680),(196,681),(196,682),(196,683),(196,684),(196,685),(196,686),(196,687),(196,688),(196,689),(196,690),(196,691),(196,692),(196,693),(196,694),(196,695),(196,696),(196,697),(196,698),(196,699),(196,700),(196,701),(196,702),(196,703),(196,704),(196,705),(196,706),(196,707),(196,708),(196,709),(196,710),(196,711),(196,712),(196,713),(196,714),(196,715),(196,716),(196,717),(196,718),(196,719),(196,721),(196,722),(196,723),(196,724),(196,725),(196,726),(196,727),(196,728),(196,729),(196,730),(196,733),(196,734),(196,735),(196,736),(196,738),(196,739),(196,748),(196,753),(196,757),(196,773),(196,777),(196,836),(196,837),(196,838),(196,839),(196,840),(196,841),(197,232),(197,236),(197,237),(197,273),(197,274),(197,275),(197,276),(197,277),(197,284),(197,285),(197,286),(197,301),(197,311),(197,387),(197,388),(197,389),(197,390),(197,391),(197,392),(197,393),(197,394),(197,395),(197,396),(197,397),(197,398),(197,399),(197,479),(197,480),(197,481),(197,482),(197,485),(197,486),(197,487),(197,494),(197,506),(197,509),(197,510),(197,517),(197,518),(197,521),(197,542),(197,543),(197,550),(197,558),(197,568),(197,571),(197,572),(197,573),(197,574),(197,575),(197,576),(197,577),(197,578),(197,579),(197,580),(197,583),(197,584),(197,585),(197,586),(197,587),(197,588),(197,589),(197,590),(197,591),(197,594),(197,595),(197,601),(197,743),(197,750),(197,758),(197,761),(197,762),(197,763),(197,764),(197,765),(197,766),(197,767),(197,768),(197,769),(197,770),(197,771),(197,772),(197,774),(198,218),(198,300),(198,312),(198,315),(198,316),(198,317),(198,318),(198,367),(198,368),(198,369),(198,370),(198,371),(198,372),(198,374),(198,376),(198,377),(198,378),(198,379),(198,380),(198,381),(198,382),(198,383),(198,384),(198,385),(198,386),(198,408),(198,409),(198,410),(198,411),(198,412),(198,413),(198,414),(198,415),(198,416),(198,430),(198,431),(198,432),(198,433),(198,462),(198,466),(198,467),(198,468),(198,469),(198,470),(198,471),(198,483),(198,484),(198,490),(198,504),(198,512),(198,515),(198,520),(198,524),(198,528),(198,531),(198,532),(198,544),(198,545),(198,546),(198,547),(198,548),(198,549),(198,551),(198,552),(198,553),(198,554),(198,555),(198,557),(198,559),(198,560),(198,561),(198,562),(198,563),(198,564),(198,565),(198,566),(198,567),(198,569),(198,570),(198,597),(198,598),(198,599),(198,600),(198,737),(198,740),(198,741),(198,742),(198,744),(198,745),(198,746),(198,747),(198,749),(198,751),(198,752),(198,754),(198,755),(198,756),(198,759),(198,760),(198, 852),(199,217),(199,221),(199,222),(199,223),(199,225),(199,263),(199,496),(199,501),(199,507),(199,525),(199,534),(199,797);
+INSERT INTO `rbac_linked_permissions` VALUES (192,21),(192,42),(192,43),(192,193),(192,196),(192,778),(192,779),(192,780),(192,781),(192,782),(192,783),(192,784),(192,785),(192,786),(192,787),(192,788),(192,789),(192,790),(192,791),(192,792),(192,793),(192,794),(192,795),(192,796),(192,835),(193,48),(193,194),(193,197),(194,1),(194,2),(194,11),(194,13),(194,14),(194,15),(194,16),(194,17),(194,18),(194,19),(194,20),(194,22),(194,23),(194,25),(194,26),(194,27),(194,28),(194,29),(194,30),(194,31),(194,32),(194,33),(194,34),(194,35),(194,36),(194,37),(194,38),(194,39),(194,40),(194,41),(194,44),(194,46),(194,47),(194,51),(194,195),(194,198),(194,632),(194,798),(195,3),(195,4),(195,5),(195,6),(195,24),(195,49),(195,199),(196,200),(196,201),(196,226),(196,227),(196,230),(196,231),(196,233),(196,234),(196,235),(196,238),(196,239),(196,240),(196,241),(196,242),(196,243),(196,244),(196,245),(196,246),(196,247),(196,248),(196,249),(196,250),(196,251),(196,252),(196,253),(196,254),(196,255),(196,256),(196,257),(196,258),(196,259),(196,260),(196,261),(196,262),(196,264),(196,265),(196,266),(196,267),(196,268),(196,269),(196,270),(196,271),(196,272),(196,279),(196,280),(196,283),(196,287),(196,288),(196,289),(196,290),(196,291),(196,292),(196,293),(196,294),(196,295),(196,296),(196,297),(196,298),(196,299),(196,302),(196,303),(196,304),(196,305),(196,306),(196,307),(196,308),(196,309),(196,310),(196,313),(196,314),(196,319),(196,320),(196,321),(196,322),(196,323),(196,324),(196,325),(196,326),(196,327),(196,328),(196,329),(196,330),(196,331),(196,332),(196,333),(196,334),(196,335),(196,336),(196,337),(196,338),(196,339),(196,340),(196,341),(196,342),(196,343),(196,344),(196,345),(196,346),(196,347),(196,348),(196,349),(196,350),(196,351),(196,352),(196,353),(196,354),(196,355),(196,356),(196,357),(196,358),(196,359),(196,360),(196,361),(196,362),(196,363),(196,364),(196,365),(196,366),(196,373),(196,375),(196,400),(196,401),(196,402),(196,403),(196,404),(196,405),(196,406),(196,407),(196,417),(196,418),(196,419),(196,420),(196,421),(196,422),(196,423),(196,424),(196,425),(196,426),(196,427),(196,428),(196,429),(196,434),(196,435),(196,436),(196,437),(196,438),(196,439),(196,440),(196,441),(196,442),(196,443),(196,444),(196,445),(196,446),(196,447),(196,448),(196,449),(196,450),(196,451),(196,452),(196,453),(196,454),(196,455),(196,456),(196,457),(196,458),(196,459),(196,461),(196,463),(196,464),(196,465),(196,472),(196,473),(196,474),(196,475),(196,476),(196,477),(196,478),(196,488),(196,489),(196,491),(196,492),(196,493),(196,495),(196,497),(196,498),(196,499),(196,500),(196,502),(196,503),(196,505),(196,508),(196,511),(196,513),(196,514),(196,516),(196,519),(196,522),(196,523),(196,526),(196,527),(196,529),(196,530),(196,533),(196,535),(196,536),(196,537),(196,538),(196,539),(196,540),(196,541),(196,556),(196,581),(196,582),(196,592),(196,593),(196,596),(196,602),(196,603),(196,604),(196,605),(196,606),(196,607),(196,608),(196,609),(196,610),(196,611),(196,612),(196,613),(196,614),(196,615),(196,616),(196,617),(196,618),(196,619),(196,620),(196,621),(196,622),(196,623),(196,624),(196,625),(196,626),(196,627),(196,628),(196,629),(196,630),(196,631),(196,633),(196,634),(196,635),(196,636),(196,637),(196,638),(196,639),(196,640),(196,641),(196,642),(196,643),(196,644),(196,645),(196,646),(196,647),(196,648),(196,649),(196,650),(196,651),(196,652),(196,653),(196,654),(196,655),(196,656),(196,657),(196,658),(196,659),(196,660),(196,661),(196,662),(196,663),(196,664),(196,665),(196,666),(196,667),(196,668),(196,669),(196,670),(196,671),(196,672),(196,673),(196,674),(196,675),(196,676),(196,677),(196,678),(196,679),(196,680),(196,681),(196,682),(196,683),(196,684),(196,685),(196,686),(196,687),(196,688),(196,689),(196,690),(196,691),(196,692),(196,693),(196,694),(196,695),(196,696),(196,697),(196,698),(196,699),(196,700),(196,701),(196,702),(196,703),(196,704),(196,705),(196,706),(196,707),(196,708),(196,709),(196,710),(196,711),(196,712),(196,713),(196,714),(196,715),(196,716),(196,717),(196,718),(196,719),(196,721),(196,722),(196,723),(196,724),(196,725),(196,726),(196,727),(196,728),(196,729),(196,730),(196,733),(196,734),(196,735),(196,736),(196,738),(196,739),(196,748),(196,753),(196,757),(196,773),(196,777),(196,836),(196,837),(196,838),(196,839),(196,840),(196,841),(197,232),(197,236),(197,237),(197,273),(197,274),(197,275),(197,276),(197,277),(197,284),(197,285),(197,286),(197,301),(197,311),(197,387),(197,388),(197,389),(197,390),(197,391),(197,392),(197,393),(197,394),(197,395),(197,396),(197,397),(197,398),(197,399),(197,479),(197,480),(197,481),(197,482),(197,485),(197,486),(197,487),(197,494),(197,506),(197,509),(197,510),(197,517),(197,518),(197,521),(197,542),(197,543),(197,550),(197,558),(197,568),(197,571),(197,572),(197,573),(197,574),(197,575),(197,576),(197,577),(197,578),(197,579),(197,580),(197,583),(197,584),(197,585),(197,586),(197,587),(197,588),(197,589),(197,590),(197,591),(197,594),(197,595),(197,601),(197,743),(197,750),(197,758),(197,761),(197,762),(197,763),(197,764),(197,765),(197,766),(197,767),(197,768),(197,769),(197,770),(197,771),(197,772),(197,774),(198,218),(198,300),(198,312),(198,315),(198,316),(198,317),(198,318),(198,367),(198,368),(198,369),(198,370),(198,371),(198,372),(198,374),(198,376),(198,377),(198,378),(198,379),(198,380),(198,381),(198,382),(198,383),(198,384),(198,385),(198,386),(198,408),(198,409),(198,410),(198,411),(198,412),(198,413),(198,414),(198,415),(198,416),(198,430),(198,431),(198,432),(198,433),(198,462),(198,466),(198,467),(198,468),(198,469),(198,470),(198,471),(198,483),(198,484),(198,490),(198,504),(198,512),(198,515),(198,520),(198,524),(198,528),(198,531),(198,532),(198,544),(198,545),(198,546),(198,547),(198,548),(198,549),(198,551),(198,552),(198,553),(198,554),(198,555),(198,557),(198,559),(198,560),(198,561),(198,562),(198,563),(198,564),(198,565),(198,566),(198,567),(198,569),(198,570),(198,597),(198,598),(198,599),(198,600),(198,737),(198,740),(198,741),(198,742),(198,744),(198,745),(198,746),(198,747),(198,749),(198,751),(198,752),(198,754),(198,755),(198,756),(198,759),(198,760),(198,852),(199,217),(199,221),(199,222),(199,223),(199,225),(199,263),(199,496),(199,501),(199,507),(199,525),(199,534),(199,797);
 /*!40000 ALTER TABLE `rbac_linked_permissions` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -399,7 +399,7 @@ CREATE TABLE `rbac_permissions` (
 
 LOCK TABLES `rbac_permissions` WRITE;
 /*!40000 ALTER TABLE `rbac_permissions` DISABLE KEYS */;
-INSERT INTO `rbac_permissions` VALUES (1,'Instant logout'),(2,'Skip Queue'),(3,'Join Normal Battleground'),(4,'Join Random Battleground'),(5,'Join Arenas'),(6,'Join Dungeon Finder'),(11,'Log GM trades'),(13,'Skip Instance required bosses check'),(14,'Skip character creation team mask check'),(15,'Skip character creation class mask check'),(16,'Skip character creation race mask check'),(17,'Skip character creation reserved name check'),(18,'Skip character creation death knight min level check'),(19,'Skip needed requirements to use channel check'),(20,'Skip disable map check'),(21,'Skip reset talents when used more than allowed check'),(22,'Skip spam chat check'),(23,'Skip over-speed ping check'),(24,'Two side faction characters on the same account'),(25,'Allow say chat between factions'),(26,'Allow channel chat between factions'),(27,'Two side mail interaction'),(28,'See two side who list'),(29,'Add friends of other faction'),(30,'Save character without delay with .save command'),(31,'Use params with .unstuck command'),(32,'Can be assigned tickets with .assign ticket command'),(33,'Notify if a command was not found'),(34,'Check if should appear in list using .gm ingame command'),(35,'See all security levels with who command'),(36,'Filter whispers'),(37,'Use staff badge in chat'),(38,'Resurrect with full Health Points'),(39,'Restore saved gm setting states'),(40,'Allows to add a gm to friend list'),(41,'Use Config option START_GM_LEVEL to assign new character level'),(42,'Allows to use CMSG_WORLD_TELEPORT opcode'),(43,'Allows to use CMSG_WHOIS opcode'),(44,'Receive global GM messages/texts'),(45,'Join channels without announce'),(46,'Change channel settings without being channel moderator'),(47,'Enables lower security than target check'),(48,'Enable IP, Last Login and EMail output in pinfo'),(49,'Forces to enter the email for confirmation on password change'),(50,'Allow user to check his own email with .account'),(51,'Allow trading between factions'),(192,'Role: Sec Level Administrator'),(193,'Role: Sec Level Gamemaster'),(194,'Role: Sec Level Moderator'),(195,'Role: Sec Level Player'),(196,'Role: Administrator Commands'),(197,'Role: Gamemaster Commands'),(198,'Role: Moderator Commands'),(199,'Role: Player Commands'),(200,'Command: rbac'),(201,'Command: rbac account'),(202,'Command: rbac account list'),(203,'Command: rbac account grant'),(204,'Command: rbac account deny'),(205,'Command: rbac account revoke'),(206,'Command: rbac list'),(217,'Command: account'),(218,'Command: account addon'),(219,'Command: account create'),(220,'Command: account delete'),(221,'Command: account lock'),(222,'Command: account lock country'),(223,'Command: account lock ip'),(224,'Command: account onlinelist'),(225,'Command: account password'),(226,'Command: account set'),(227,'Command: account set addon'),(228,'Command: account set gmlevel'),(229,'Command: account set password'),(230,'Command: achievement'),(231,'Command: achievement add'),(232,'Command: arena'),(233,'Command: arena captain'),(234,'Command: arena create'),(235,'Command: arena disband'),(236,'Command: arena info'),(237,'Command: arena lookup'),(238,'Command: arena rename'),(239,'Command: ban'),(240,'Command: ban account'),(241,'Command: ban character'),(242,'Command: ban ip'),(243,'Command: ban playeraccount'),(244,'Command: baninfo'),(245,'Command: baninfo account'),(246,'Command: baninfo character'),(247,'Command: baninfo ip'),(248,'Command: banlist'),(249,'Command: banlist account'),(250,'Command: banlist character'),(251,'Command: banlist ip'),(252,'Command: unban'),(253,'Command: unban account'),(254,'Command: unban character'),(255,'Command: unban ip'),(256,'Command: unban playeraccount'),(257,'Command: bf'),(258,'Command: bf start'),(259,'Command: bf stop'),(260,'Command: bf switch'),(261,'Command: bf timer'),(262,'Command: bf enable'),(263,'Command: account email'),(264,'Command: account set sec'),(265,'Command: account set sec email'),(266,'Command: account set sec regmail'),(267,'Command: cast'),(268,'Command: cast back'),(269,'Command: cast dist'),(270,'Command: cast self'),(271,'Command: cast target'),(272,'Command: cast dest'),(273,'Command: character'),(274,'Command: character customize'),(275,'Command: character changefaction'),(276,'Command: character changerace'),(277,'Command: character deleted'),(279,'Command: character deleted list'),(280,'Command: character deleted restore'),(283,'Command: character level'),(284,'Command: character rename'),(285,'Command: character reputation'),(286,'Command: character titles'),(287,'Command: levelup'),(288,'Command: pdump'),(289,'Command: pdump load'),(290,'Command: pdump write'),(291,'Command: cheat'),(292,'Command: cheat casttime'),(293,'Command: cheat cooldown'),(294,'Command: cheat explore'),(295,'Command: cheat god'),(296,'Command: cheat power'),(297,'Command: cheat status'),(298,'Command: cheat taxi'),(299,'Command: cheat waterwalk'),(300,'Command: debug'),(301,'Command: debug anim'),(302,'Command: debug areatriggers'),(303,'Command: debug arena'),(304,'Command: debug bg'),(305,'Command: debug entervehicle'),(306,'Command: debug getitemstate'),(307,'Command: debug getitemvalue'),(308,'Command: debug getvalue'),(309,'Command: debug hostil'),(310,'Command: debug itemexpire'),(311,'Command: debug lootrecipient'),(312,'Command: debug los'),(313,'Command: debug mod32value'),(314,'Command: debug moveflags'),(315,'Command: debug play'),(316,'Command: debug play cinematics'),(317,'Command: debug play movie'),(318,'Command: debug play sound'),(319,'Command: debug send'),(320,'Command: debug send buyerror'),(321,'Command: debug send channelnotify'),(322,'Command: debug send chatmessage'),(323,'Command: debug send equiperror'),(324,'Command: debug send largepacket'),(325,'Command: debug send opcode'),(326,'Command: debug send qinvalidmsg'),(327,'Command: debug send qpartymsg'),(328,'Command: debug send sellerror'),(329,'Command: debug send setphaseshift'),(330,'Command: debug send spellfail'),(331,'Command: debug setaurastate'),(332,'Command: debug setbit'),(333,'Command: debug setitemvalue'),(334,'Command: debug setvalue'),(335,'Command: debug setvid'),(336,'Command: debug spawnvehicle'),(337,'Command: debug threat'),(338,'Command: debug update'),(339,'Command: debug uws'),(340,'Command: wpgps'),(341,'Command: deserter'),(342,'Command: deserter bg'),(343,'Command: deserter bg add'),(344,'Command: deserter bg remove'),(345,'Command: deserter instance'),(346,'Command: deserter instance add'),(347,'Command: deserter instance remove'),(348,'Command: disable'),(349,'Command: disable add'),(350,'Command: disable add achievement_criteria'),(351,'Command: disable add battleground'),(352,'Command: disable add map'),(353,'Command: disable add mmap'),(354,'Command: disable add outdoorpvp'),(355,'Command: disable add quest'),(356,'Command: disable add spell'),(357,'Command: disable add vmap'),(358,'Command: disable remove'),(359,'Command: disable remove achievement_criteria'),(360,'Command: disable remove battleground'),(361,'Command: disable remove map'),(362,'Command: disable remove mmap'),(363,'Command: disable remove outdoorpvp'),(364,'Command: disable remove quest'),(365,'Command: disable remove spell'),(366,'Command: disable remove vmap'),(367,'Command: event'),(368,'Command: event activelist'),(369,'Command: event start'),(370,'Command: event stop'),(371,'Command: gm'),(372,'Command: gm chat'),(373,'Command: gm fly'),(374,'Command: gm ingame'),(375,'Command: gm list'),(376,'Command: gm visible'),(377,'Command: go'),(378,'Command: go creature'),(379,'Command: go graveyard'),(380,'Command: go grid'),(381,'Command: go object'),(382,'Command: go taxinode'),(383,'Command: go ticket'),(384,'Command: go trigger'),(385,'Command: go xyz'),(386,'Command: go zonexy'),(387,'Command: gobject'),(388,'Command: gobject activate'),(389,'Command: gobject add'),(390,'Command: gobject add temp'),(391,'Command: gobject delete'),(392,'Command: gobject info'),(393,'Command: gobject move'),(394,'Command: gobject near'),(395,'Command: gobject set'),(396,'Command: gobject set phase'),(397,'Command: gobject set state'),(398,'Command: gobject target'),(399,'Command: gobject turn'),(400,'debug transport'),(401,'Command: guild'),(402,'Command: guild create'),(403,'Command: guild delete'),(404,'Command: guild invite'),(405,'Command: guild uninvite'),(406,'Command: guild rank'),(407,'Command: guild rename'),(408,'Command: honor'),(409,'Command: honor add'),(410,'Command: honor add kill'),(411,'Command: honor update'),(412,'Command: instance'),(413,'Command: instance listbinds'),(414,'Command: instance unbind'),(415,'Command: instance stats'),(416,'Command: instance savedata'),(417,'Command: learn'),(418,'Command: learn all'),(419,'Command: learn all my'),(420,'Command: learn all my class'),(421,'Command: learn all my pettalents'),(422,'Command: learn all my spells'),(423,'Command: learn all my talents'),(424,'Command: learn all gm'),(425,'Command: learn all crafts'),(426,'Command: learn all default'),(427,'Command: learn all lang'),(428,'Command: learn all recipes'),(429,'Command: unlearn'),(430,'Command: lfg'),(431,'Command: lfg player'),(432,'Command: lfg group'),(433,'Command: lfg queue'),(434,'Command: lfg clean'),(435,'Command: lfg options'),(436,'Command: list'),(437,'Command: list creature'),(438,'Command: list item'),(439,'Command: list object'),(440,'Command: list auras'),(441,'Command: list mail'),(442,'Command: lookup'),(443,'Command: lookup area'),(444,'Command: lookup creature'),(445,'Command: lookup event'),(446,'Command: lookup faction'),(447,'Command: lookup item'),(448,'Command: lookup itemset'),(449,'Command: lookup object'),(450,'Command: lookup quest'),(451,'Command: lookup player'),(452,'Command: lookup player ip'),(453,'Command: lookup player account'),(454,'Command: lookup player email'),(455,'Command: lookup skill'),(456,'Command: lookup spell'),(457,'Command: lookup spell id'),(458,'Command: lookup taxinode'),(459,'Command: lookup tele'),(460,'Command: lookup title'),(461,'Command: lookup map'),(462,'Command: announce'),(463,'Command: channel'),(464,'Command: channel set'),(465,'Command: channel set ownership'),(466,'Command: gmannounce'),(467,'Command: gmnameannounce'),(468,'Command: gmnotify'),(469,'Command: nameannounce'),(470,'Command: notify'),(471,'Command: whispers'),(472,'Command: group'),(473,'Command: group leader'),(474,'Command: group disband'),(475,'Command: group remove'),(476,'Command: group join'),(477,'Command: group list'),(478,'Command: group summon'),(479,'Command: pet'),(480,'Command: pet create'),(481,'Command: pet learn'),(482,'Command: pet unlearn'),(483,'Command: send'),(484,'Command: send items'),(485,'Command: send mail'),(486,'Command: send message'),(487,'Command: send money'),(488,'Command: additem'),(489,'Command: additemset'),(490,'Command: appear'),(491,'Command: aura'),(492,'Command: bank'),(493,'Command: bindsight'),(494,'Command: combatstop'),(495,'Command: cometome'),(496,'Command: commands'),(497,'Command: cooldown'),(498,'Command: damage'),(499,'Command: dev'),(500,'Command: die'),(501,'Command: dismount'),(502,'Command: distance'),(503,'Command: flusharenapoints'),(504,'Command: freeze'),(505,'Command: gps'),(506,'Command: guid'),(507,'Command: help'),(508,'Command: hidearea'),(509,'Command: itemmove'),(510,'Command: kick'),(511,'Command: linkgrave'),(512,'Command: listfreeze'),(513,'Command: maxskill'),(514,'Command: movegens'),(515,'Command: mute'),(516,'Command: neargrave'),(517,'Command: pinfo'),(518,'Command: playall'),(519,'Command: possess'),(520,'Command: recall'),(521,'Command: repairitems'),(522,'Command: respawn'),(523,'Command: revive'),(524,'Command: saveall'),(525,'Command: save'),(526,'Command: setskill'),(527,'Command: showarea'),(528,'Command: summon'),(529,'Command: unaura'),(530,'Command: unbindsight'),(531,'Command: unfreeze'),(532,'Command: unmute'),(533,'Command: unpossess'),(534,'Command: unstuck'),(535,'Command: wchange'),(536,'Command: mmap'),(537,'Command: mmap loadedtiles'),(538,'Command: mmap loc'),(539,'Command: mmap path'),(540,'Command: mmap stats'),(541,'Command: mmap testarea'),(542,'Command: morph'),(543,'Command: demorph'),(544,'Command: modify'),(545,'Command: modify arenapoints'),(546,'Command: modify bit'),(547,'Command: modify drunk'),(548,'Command: modify energy'),(549,'Command: modify faction'),(550,'Command: modify gender'),(551,'Command: modify honor'),(552,'Command: modify hp'),(553,'Command: modify mana'),(554,'Command: modify money'),(555,'Command: modify mount'),(556,'Command: modify phase'),(557,'Command: modify rage'),(558,'Command: modify reputation'),(559,'Command: modify runicpower'),(560,'Command: modify scale'),(561,'Command: modify speed'),(562,'Command: modify speed all'),(563,'Command: modify speed backwalk'),(564,'Command: modify speed fly'),(565,'Command: modify speed walk'),(566,'Command: modify speed swim'),(567,'Command: modify spell'),(568,'Command: modify standstate'),(569,'Command: modify talentpoints'),(570,'Command: npc'),(571,'Command: npc add'),(572,'Command: npc add formation'),(573,'Command: npc add item'),(574,'Command: npc add move'),(575,'Command: npc add temp'),(576,'Command: npc add delete'),(577,'Command: npc add delete item'),(578,'Command: npc add follow'),(579,'Command: npc add follow stop'),(580,'Command: npc set'),(581,'Command: npc set allowmove'),(582,'Command: npc set entry'),(583,'Command: npc set factionid'),(584,'Command: npc set flag'),(585,'Command: npc set level'),(586,'Command: npc set link'),(587,'Command: npc set model'),(588,'Command: npc set movetype'),(589,'Command: npc set phase'),(590,'Command: npc set spawndist'),(591,'Command: npc set spawntime'),(592,'Command: npc set data'),(593,'Command: npc info'),(594,'Command: npc near'),(595,'Command: npc move'),(596,'Command: npc playemote'),(597,'Command: npc say'),(598,'Command: npc textemote'),(599,'Command: npc whisper'),(600,'Command: npc yell'),(601,'Command: npc tame'),(602,'Command: quest'),(603,'Command: quest add'),(604,'Command: quest complete'),(605,'Command: quest remove'),(606,'Command: quest reward'),(607,'Command: reload'),(608,'Command: reload access_requirement'),(609,'Command: reload achievement_criteria_data'),(610,'Command: reload achievement_reward'),(611,'Command: reload all'),(612,'Command: reload all achievement'),(613,'Command: reload all area'),(614,'Command: broadcast_text'),(615,'Command: reload all gossips'),(616,'Command: reload all item'),(617,'Command: reload all locales'),(618,'Command: reload all loot'),(619,'Command: reload all npc'),(620,'Command: reload all quest'),(621,'Command: reload all scripts'),(622,'Command: reload all spell'),(623,'Command: reload areatrigger_involvedrelation'),(624,'Command: reload areatrigger_tavern'),(625,'Command: reload areatrigger_teleport'),(626,'Command: reload auctions'),(627,'Command: reload autobroadcast'),(628,'Command: reload command'),(629,'Command: reload conditions'),(630,'Command: reload config'),(631,'Command: reload battleground_template'),(632,'Command: .mutehistory'),(633,'Command: reload creature_linked_respawn'),(634,'Command: reload creature_loot_template'),(635,'Command: reload creature_onkill_reputation'),(636,'Command: reload creature_questender'),(637,'Command: reload creature_queststarter'),(638,'Command: reload creature_summon_groups'),(639,'Command: reload creature_template'),(640,'Command: reload creature_text'),(641,'Command: reload disables'),(642,'Command: reload disenchant_loot_template'),(643,'Command: reload event_scripts'),(644,'Command: reload fishing_loot_template'),(645,'Command: reload game_graveyard_zone'),(646,'Command: reload game_tele'),(647,'Command: reload gameobject_questender'),(648,'Command: reload gameobject_loot_template'),(649,'Command: reload gameobject_queststarter'),(650,'Command: reload gm_tickets'),(651,'Command: reload gossip_menu'),(652,'Command: reload gossip_menu_option'),(653,'Command: reload item_enchantment_template'),(654,'Command: reload item_loot_template'),(655,'Command: reload item_set_names'),(656,'Command: reload lfg_dungeon_rewards'),(657,'Command: reload locales_achievement_reward'),(658,'Command: reload locales_creature'),(659,'Command: reload locales_creature_text'),(660,'Command: reload locales_gameobject'),(661,'Command: reload locales_gossip_menu_option'),(662,'Command: reload locales_item'),(663,'Command: reload locales_item_set_name'),(664,'Command: reload locales_npc_text'),(665,'Command: reload locales_page_text'),(666,'Command: reload locales_points_of_interest'),(667,'Command: reload locales_quest'),(668,'Command: reload mail_level_reward'),(669,'Command: reload mail_loot_template'),(670,'Command: reload milling_loot_template'),(671,'Command: reload npc_spellclick_spells'),(672,'Command: reload npc_trainer'),(673,'Command: reload npc_vendor'),(674,'Command: reload page_text'),(675,'Command: reload pickpocketing_loot_template'),(676,'Command: reload points_of_interest'),(677,'Command: reload prospecting_loot_template'),(678,'Command: reload quest_poi'),(679,'Command: reload quest_template'),(680,'Command: reload rbac'),(681,'Command: reload reference_loot_template'),(682,'Command: reload reserved_name'),(683,'Command: reload reputation_reward_rate'),(684,'Command: reload reputation_spillover_template'),(685,'Command: reload skill_discovery_template'),(686,'Command: reload skill_extra_item_template'),(687,'Command: reload skill_fishing_base_level'),(688,'Command: reload skinning_loot_template'),(689,'Command: reload smart_scripts'),(690,'Command: reload spell_required'),(691,'Command: reload spell_area'),(692,'Command: reload spell_bonus_data'),(693,'Command: reload spell_group'),(694,'Command: reload spell_learn_spell'),(695,'Command: reload spell_loot_template'),(696,'Command: reload spell_linked_spell'),(697,'Command: reload spell_pet_auras'),(698,'Command: character changeaccount'),(699,'Command: reload spell_proc'),(700,'Command: reload spell_scripts'),(701,'Command: reload spell_target_position'),(702,'Command: reload spell_threats'),(703,'Command: reload spell_group_stack_rules'),(704,'Command: reload trinity_string'),(705,'Command: reload warden_action'),(706,'Command: reload waypoint_scripts'),(707,'Command: reload waypoint_data'),(708,'Command: reload vehicle_accessory'),(709,'Command: reload vehicle_template_accessory'),(710,'Command: reset'),(711,'Command: reset achievements'),(712,'Command: reset honor'),(713,'Command: reset level'),(714,'Command: reset spells'),(715,'Command: reset stats'),(716,'Command: reset talents'),(717,'Command: reset all'),(718,'Command: server'),(719,'Command: server corpses'),(720,'Command: server exit'),(721,'Command: server idlerestart'),(722,'Command: server idlerestart cancel'),(723,'Command: server idleshutdown'),(724,'Command: server idleshutdown cancel'),(725,'Command: server info'),(726,'Command: server plimit'),(727,'Command: server restart'),(728,'Command: server restart cancel'),(729,'Command: server set'),(730,'Command: server set closed'),(731,'Command: server set difftime'),(732,'Command: server set loglevel'),(733,'Command: server set motd'),(734,'Command: server shutdown'),(735,'Command: server shutdown cancel'),(736,'Command: server motd'),(737,'Command: tele'),(738,'Command: tele add'),(739,'Command: tele del'),(740,'Command: tele name'),(741,'Command: tele group'),(742,'Command: ticket'),(743,'Command: ticket assign'),(744,'Command: ticket close'),(745,'Command: ticket closedlist'),(746,'Command: ticket comment'),(747,'Command: ticket complete'),(748,'Command: ticket delete'),(749,'Command: ticket escalate'),(750,'Command: ticket escalatedlist'),(751,'Command: ticket list'),(752,'Command: ticket onlinelist'),(753,'Command: ticket reset'),(754,'Command: ticket response'),(755,'Command: ticket response append'),(756,'Command: ticket response appendln'),(757,'Command: ticket togglesystem'),(758,'Command: ticket unassign'),(759,'Command: ticket viewid'),(760,'Command: ticket viewname'),(761,'Command: titles'),(762,'Command: titles add'),(763,'Command: titles current'),(764,'Command: titles remove'),(765,'Command: titles set'),(766,'Command: titles set mask'),(767,'Command: wp'),(768,'Command: wp add'),(769,'Command: wp event'),(770,'Command: wp load'),(771,'Command: wp modify'),(772,'Command: wp unload'),(773,'Command: wp reload'),(774,'Command: wp show'),(777,'Command: mailbox'),(778,'Command: ahbot'),(779,'Command: ahbot items'),(780,'Command: ahbot items gray'),(781,'Command: ahbot items white'),(782,'Command: ahbot items green'),(783,'Command: ahbot items blue'),(784,'Command: ahbot items purple'),(785,'Command: ahbot items orange'),(786,'Command: ahbot items yellow'),(787,'Command: ahbot ratio'),(788,'Command: ahbot ratio alliance'),(789,'Command: ahbot ratio horde'),(790,'Command: ahbot ratio neutral'),(791,'Command: ahbot rebuild'),(792,'Command: ahbot reload'),(793,'Command: ahbot status'),(794,'Command: .guild info'),(795,'Command: .instance setbossstate'),(796,'Command: instance getbossstate'),(797,'Command: pvpstats'),(798,'Command: .mod xp'),(835,'Command: debug loadcells'),(836,'Command: .debug boundary'),(837,'Command: .npc evade'),(838,'Command: .pet level'),(839,'Command: .server shutdown force'),(840,'Command: .server restart force'),(841,'Command: .debug neargraveyard'),(852, 'Command: go offset');
+INSERT INTO `rbac_permissions` VALUES (1,'Instant logout'),(2,'Skip Queue'),(3,'Join Normal Battleground'),(4,'Join Random Battleground'),(5,'Join Arenas'),(6,'Join Dungeon Finder'),(11,'Log GM trades'),(13,'Skip Instance required bosses check'),(14,'Skip character creation team mask check'),(15,'Skip character creation class mask check'),(16,'Skip character creation race mask check'),(17,'Skip character creation reserved name check'),(18,'Skip character creation death knight min level check'),(19,'Skip needed requirements to use channel check'),(20,'Skip disable map check'),(21,'Skip reset talents when used more than allowed check'),(22,'Skip spam chat check'),(23,'Skip over-speed ping check'),(24,'Two side faction characters on the same account'),(25,'Allow say chat between factions'),(26,'Allow channel chat between factions'),(27,'Two side mail interaction'),(28,'See two side who list'),(29,'Add friends of other faction'),(30,'Save character without delay with .save command'),(31,'Use params with .unstuck command'),(32,'Can be assigned tickets with .assign ticket command'),(33,'Notify if a command was not found'),(34,'Check if should appear in list using .gm ingame command'),(35,'See all security levels with who command'),(36,'Filter whispers'),(37,'Use staff badge in chat'),(38,'Resurrect with full Health Points'),(39,'Restore saved gm setting states'),(40,'Allows to add a gm to friend list'),(41,'Use Config option START_GM_LEVEL to assign new character level'),(42,'Allows to use CMSG_WORLD_TELEPORT opcode'),(43,'Allows to use CMSG_WHOIS opcode'),(44,'Receive global GM messages/texts'),(45,'Join channels without announce'),(46,'Change channel settings without being channel moderator'),(47,'Enables lower security than target check'),(48,'Enable IP, Last Login and EMail output in pinfo'),(49,'Forces to enter the email for confirmation on password change'),(50,'Allow user to check his own email with .account'),(51,'Allow trading between factions'),(192,'Role: Sec Level Administrator'),(193,'Role: Sec Level Gamemaster'),(194,'Role: Sec Level Moderator'),(195,'Role: Sec Level Player'),(196,'Role: Administrator Commands'),(197,'Role: Gamemaster Commands'),(198,'Role: Moderator Commands'),(199,'Role: Player Commands'),(200,'Command: rbac'),(201,'Command: rbac account'),(202,'Command: rbac account list'),(203,'Command: rbac account grant'),(204,'Command: rbac account deny'),(205,'Command: rbac account revoke'),(206,'Command: rbac list'),(217,'Command: account'),(218,'Command: account addon'),(219,'Command: account create'),(220,'Command: account delete'),(221,'Command: account lock'),(222,'Command: account lock country'),(223,'Command: account lock ip'),(224,'Command: account onlinelist'),(225,'Command: account password'),(226,'Command: account set'),(227,'Command: account set addon'),(228,'Command: account set gmlevel'),(229,'Command: account set password'),(230,'Command: achievement'),(231,'Command: achievement add'),(232,'Command: arena'),(233,'Command: arena captain'),(234,'Command: arena create'),(235,'Command: arena disband'),(236,'Command: arena info'),(237,'Command: arena lookup'),(238,'Command: arena rename'),(239,'Command: ban'),(240,'Command: ban account'),(241,'Command: ban character'),(242,'Command: ban ip'),(243,'Command: ban playeraccount'),(244,'Command: baninfo'),(245,'Command: baninfo account'),(246,'Command: baninfo character'),(247,'Command: baninfo ip'),(248,'Command: banlist'),(249,'Command: banlist account'),(250,'Command: banlist character'),(251,'Command: banlist ip'),(252,'Command: unban'),(253,'Command: unban account'),(254,'Command: unban character'),(255,'Command: unban ip'),(256,'Command: unban playeraccount'),(257,'Command: bf'),(258,'Command: bf start'),(259,'Command: bf stop'),(260,'Command: bf switch'),(261,'Command: bf timer'),(262,'Command: bf enable'),(263,'Command: account email'),(264,'Command: account set sec'),(265,'Command: account set sec email'),(266,'Command: account set sec regmail'),(267,'Command: cast'),(268,'Command: cast back'),(269,'Command: cast dist'),(270,'Command: cast self'),(271,'Command: cast target'),(272,'Command: cast dest'),(273,'Command: character'),(274,'Command: character customize'),(275,'Command: character changefaction'),(276,'Command: character changerace'),(277,'Command: character deleted'),(279,'Command: character deleted list'),(280,'Command: character deleted restore'),(283,'Command: character level'),(284,'Command: character rename'),(285,'Command: character reputation'),(286,'Command: character titles'),(287,'Command: levelup'),(288,'Command: pdump'),(289,'Command: pdump load'),(290,'Command: pdump write'),(291,'Command: cheat'),(292,'Command: cheat casttime'),(293,'Command: cheat cooldown'),(294,'Command: cheat explore'),(295,'Command: cheat god'),(296,'Command: cheat power'),(297,'Command: cheat status'),(298,'Command: cheat taxi'),(299,'Command: cheat waterwalk'),(300,'Command: debug'),(301,'Command: debug anim'),(302,'Command: debug areatriggers'),(303,'Command: debug arena'),(304,'Command: debug bg'),(305,'Command: debug entervehicle'),(306,'Command: debug getitemstate'),(307,'Command: debug getitemvalue'),(308,'Command: debug getvalue'),(309,'Command: debug hostil'),(310,'Command: debug itemexpire'),(311,'Command: debug lootrecipient'),(312,'Command: debug los'),(313,'Command: debug mod32value'),(314,'Command: debug moveflags'),(315,'Command: debug play'),(316,'Command: debug play cinematics'),(317,'Command: debug play movie'),(318,'Command: debug play sound'),(319,'Command: debug send'),(320,'Command: debug send buyerror'),(321,'Command: debug send channelnotify'),(322,'Command: debug send chatmessage'),(323,'Command: debug send equiperror'),(324,'Command: debug send largepacket'),(325,'Command: debug send opcode'),(326,'Command: debug send qinvalidmsg'),(327,'Command: debug send qpartymsg'),(328,'Command: debug send sellerror'),(329,'Command: debug send setphaseshift'),(330,'Command: debug send spellfail'),(331,'Command: debug setaurastate'),(332,'Command: debug setbit'),(333,'Command: debug setitemvalue'),(334,'Command: debug setvalue'),(335,'Command: debug setvid'),(336,'Command: debug spawnvehicle'),(337,'Command: debug threat'),(338,'Command: debug update'),(339,'Command: debug uws'),(340,'Command: wpgps'),(341,'Command: deserter'),(342,'Command: deserter bg'),(343,'Command: deserter bg add'),(344,'Command: deserter bg remove'),(345,'Command: deserter instance'),(346,'Command: deserter instance add'),(347,'Command: deserter instance remove'),(348,'Command: disable'),(349,'Command: disable add'),(350,'Command: disable add achievement_criteria'),(351,'Command: disable add battleground'),(352,'Command: disable add map'),(353,'Command: disable add mmap'),(354,'Command: disable add outdoorpvp'),(355,'Command: disable add quest'),(356,'Command: disable add spell'),(357,'Command: disable add vmap'),(358,'Command: disable remove'),(359,'Command: disable remove achievement_criteria'),(360,'Command: disable remove battleground'),(361,'Command: disable remove map'),(362,'Command: disable remove mmap'),(363,'Command: disable remove outdoorpvp'),(364,'Command: disable remove quest'),(365,'Command: disable remove spell'),(366,'Command: disable remove vmap'),(367,'Command: event'),(368,'Command: event activelist'),(369,'Command: event start'),(370,'Command: event stop'),(371,'Command: gm'),(372,'Command: gm chat'),(373,'Command: gm fly'),(374,'Command: gm ingame'),(375,'Command: gm list'),(376,'Command: gm visible'),(377,'Command: go'),(378,'Command: go creature'),(379,'Command: go graveyard'),(380,'Command: go grid'),(381,'Command: go object'),(382,'Command: go taxinode'),(383,'Command: go ticket'),(384,'Command: go trigger'),(385,'Command: go xyz'),(386,'Command: go zonexy'),(387,'Command: gobject'),(388,'Command: gobject activate'),(389,'Command: gobject add'),(390,'Command: gobject add temp'),(391,'Command: gobject delete'),(392,'Command: gobject info'),(393,'Command: gobject move'),(394,'Command: gobject near'),(395,'Command: gobject set'),(396,'Command: gobject set phase'),(397,'Command: gobject set state'),(398,'Command: gobject target'),(399,'Command: gobject turn'),(400,'debug transport'),(401,'Command: guild'),(402,'Command: guild create'),(403,'Command: guild delete'),(404,'Command: guild invite'),(405,'Command: guild uninvite'),(406,'Command: guild rank'),(407,'Command: guild rename'),(408,'Command: honor'),(409,'Command: honor add'),(410,'Command: honor add kill'),(411,'Command: honor update'),(412,'Command: instance'),(413,'Command: instance listbinds'),(414,'Command: instance unbind'),(415,'Command: instance stats'),(416,'Command: instance savedata'),(417,'Command: learn'),(418,'Command: learn all'),(419,'Command: learn all my'),(420,'Command: learn all my class'),(421,'Command: learn all my pettalents'),(422,'Command: learn all my spells'),(423,'Command: learn all my talents'),(424,'Command: learn all gm'),(425,'Command: learn all crafts'),(426,'Command: learn all default'),(427,'Command: learn all lang'),(428,'Command: learn all recipes'),(429,'Command: unlearn'),(430,'Command: lfg'),(431,'Command: lfg player'),(432,'Command: lfg group'),(433,'Command: lfg queue'),(434,'Command: lfg clean'),(435,'Command: lfg options'),(436,'Command: list'),(437,'Command: list creature'),(438,'Command: list item'),(439,'Command: list object'),(440,'Command: list auras'),(441,'Command: list mail'),(442,'Command: lookup'),(443,'Command: lookup area'),(444,'Command: lookup creature'),(445,'Command: lookup event'),(446,'Command: lookup faction'),(447,'Command: lookup item'),(448,'Command: lookup itemset'),(449,'Command: lookup object'),(450,'Command: lookup quest'),(451,'Command: lookup player'),(452,'Command: lookup player ip'),(453,'Command: lookup player account'),(454,'Command: lookup player email'),(455,'Command: lookup skill'),(456,'Command: lookup spell'),(457,'Command: lookup spell id'),(458,'Command: lookup taxinode'),(459,'Command: lookup tele'),(460,'Command: lookup title'),(461,'Command: lookup map'),(462,'Command: announce'),(463,'Command: channel'),(464,'Command: channel set'),(465,'Command: channel set ownership'),(466,'Command: gmannounce'),(467,'Command: gmnameannounce'),(468,'Command: gmnotify'),(469,'Command: nameannounce'),(470,'Command: notify'),(471,'Command: whispers'),(472,'Command: group'),(473,'Command: group leader'),(474,'Command: group disband'),(475,'Command: group remove'),(476,'Command: group join'),(477,'Command: group list'),(478,'Command: group summon'),(479,'Command: pet'),(480,'Command: pet create'),(481,'Command: pet learn'),(482,'Command: pet unlearn'),(483,'Command: send'),(484,'Command: send items'),(485,'Command: send mail'),(486,'Command: send message'),(487,'Command: send money'),(488,'Command: additem'),(489,'Command: additemset'),(490,'Command: appear'),(491,'Command: aura'),(492,'Command: bank'),(493,'Command: bindsight'),(494,'Command: combatstop'),(495,'Command: cometome'),(496,'Command: commands'),(497,'Command: cooldown'),(498,'Command: damage'),(499,'Command: dev'),(500,'Command: die'),(501,'Command: dismount'),(502,'Command: distance'),(503,'Command: flusharenapoints'),(504,'Command: freeze'),(505,'Command: gps'),(506,'Command: guid'),(507,'Command: help'),(508,'Command: hidearea'),(509,'Command: itemmove'),(510,'Command: kick'),(511,'Command: linkgrave'),(512,'Command: listfreeze'),(513,'Command: maxskill'),(514,'Command: movegens'),(515,'Command: mute'),(516,'Command: neargrave'),(517,'Command: pinfo'),(518,'Command: playall'),(519,'Command: possess'),(520,'Command: recall'),(521,'Command: repairitems'),(522,'Command: respawn'),(523,'Command: revive'),(524,'Command: saveall'),(525,'Command: save'),(526,'Command: setskill'),(527,'Command: showarea'),(528,'Command: summon'),(529,'Command: unaura'),(530,'Command: unbindsight'),(531,'Command: unfreeze'),(532,'Command: unmute'),(533,'Command: unpossess'),(534,'Command: unstuck'),(535,'Command: wchange'),(536,'Command: mmap'),(537,'Command: mmap loadedtiles'),(538,'Command: mmap loc'),(539,'Command: mmap path'),(540,'Command: mmap stats'),(541,'Command: mmap testarea'),(542,'Command: morph'),(543,'Command: demorph'),(544,'Command: modify'),(545,'Command: modify arenapoints'),(546,'Command: modify bit'),(547,'Command: modify drunk'),(548,'Command: modify energy'),(549,'Command: modify faction'),(550,'Command: modify gender'),(551,'Command: modify honor'),(552,'Command: modify hp'),(553,'Command: modify mana'),(554,'Command: modify money'),(555,'Command: modify mount'),(556,'Command: modify phase'),(557,'Command: modify rage'),(558,'Command: modify reputation'),(559,'Command: modify runicpower'),(560,'Command: modify scale'),(561,'Command: modify speed'),(562,'Command: modify speed all'),(563,'Command: modify speed backwalk'),(564,'Command: modify speed fly'),(565,'Command: modify speed walk'),(566,'Command: modify speed swim'),(567,'Command: modify spell'),(568,'Command: modify standstate'),(569,'Command: modify talentpoints'),(570,'Command: npc'),(571,'Command: npc add'),(572,'Command: npc add formation'),(573,'Command: npc add item'),(574,'Command: npc add move'),(575,'Command: npc add temp'),(576,'Command: npc add delete'),(577,'Command: npc add delete item'),(578,'Command: npc add follow'),(579,'Command: npc add follow stop'),(580,'Command: npc set'),(581,'Command: npc set allowmove'),(582,'Command: npc set entry'),(583,'Command: npc set factionid'),(584,'Command: npc set flag'),(585,'Command: npc set level'),(586,'Command: npc set link'),(587,'Command: npc set model'),(588,'Command: npc set movetype'),(589,'Command: npc set phase'),(590,'Command: npc set spawndist'),(591,'Command: npc set spawntime'),(592,'Command: npc set data'),(593,'Command: npc info'),(594,'Command: npc near'),(595,'Command: npc move'),(596,'Command: npc playemote'),(597,'Command: npc say'),(598,'Command: npc textemote'),(599,'Command: npc whisper'),(600,'Command: npc yell'),(601,'Command: npc tame'),(602,'Command: quest'),(603,'Command: quest add'),(604,'Command: quest complete'),(605,'Command: quest remove'),(606,'Command: quest reward'),(607,'Command: reload'),(608,'Command: reload access_requirement'),(609,'Command: reload achievement_criteria_data'),(610,'Command: reload achievement_reward'),(611,'Command: reload all'),(612,'Command: reload all achievement'),(613,'Command: reload all area'),(614,'Command: broadcast_text'),(615,'Command: reload all gossips'),(616,'Command: reload all item'),(617,'Command: reload all locales'),(618,'Command: reload all loot'),(619,'Command: reload all npc'),(620,'Command: reload all quest'),(621,'Command: reload all scripts'),(622,'Command: reload all spell'),(623,'Command: reload areatrigger_involvedrelation'),(624,'Command: reload areatrigger_tavern'),(625,'Command: reload areatrigger_teleport'),(626,'Command: reload auctions'),(627,'Command: reload autobroadcast'),(628,'Command: reload command'),(629,'Command: reload conditions'),(630,'Command: reload config'),(631,'Command: reload battleground_template'),(632,'Command: .mutehistory'),(633,'Command: reload creature_linked_respawn'),(634,'Command: reload creature_loot_template'),(635,'Command: reload creature_onkill_reputation'),(636,'Command: reload creature_questender'),(637,'Command: reload creature_queststarter'),(638,'Command: reload creature_summon_groups'),(639,'Command: reload creature_template'),(640,'Command: reload creature_text'),(641,'Command: reload disables'),(642,'Command: reload disenchant_loot_template'),(643,'Command: reload event_scripts'),(644,'Command: reload fishing_loot_template'),(645,'Command: reload game_graveyard_zone'),(646,'Command: reload game_tele'),(647,'Command: reload gameobject_questender'),(648,'Command: reload gameobject_loot_template'),(649,'Command: reload gameobject_queststarter'),(650,'Command: reload gm_tickets'),(651,'Command: reload gossip_menu'),(652,'Command: reload gossip_menu_option'),(653,'Command: reload item_enchantment_template'),(654,'Command: reload item_loot_template'),(655,'Command: reload item_set_names'),(656,'Command: reload lfg_dungeon_rewards'),(657,'Command: reload locales_achievement_reward'),(658,'Command: reload locales_creature'),(659,'Command: reload locales_creature_text'),(660,'Command: reload locales_gameobject'),(661,'Command: reload locales_gossip_menu_option'),(662,'Command: reload locales_item'),(663,'Command: reload locales_item_set_name'),(664,'Command: reload locales_npc_text'),(665,'Command: reload locales_page_text'),(666,'Command: reload locales_points_of_interest'),(667,'Command: reload locales_quest'),(668,'Command: reload mail_level_reward'),(669,'Command: reload mail_loot_template'),(670,'Command: reload milling_loot_template'),(671,'Command: reload npc_spellclick_spells'),(672,'Command: reload npc_trainer'),(673,'Command: reload npc_vendor'),(674,'Command: reload page_text'),(675,'Command: reload pickpocketing_loot_template'),(676,'Command: reload points_of_interest'),(677,'Command: reload prospecting_loot_template'),(678,'Command: reload quest_poi'),(679,'Command: reload quest_template'),(680,'Command: reload rbac'),(681,'Command: reload reference_loot_template'),(682,'Command: reload reserved_name'),(683,'Command: reload reputation_reward_rate'),(684,'Command: reload reputation_spillover_template'),(685,'Command: reload skill_discovery_template'),(686,'Command: reload skill_extra_item_template'),(687,'Command: reload skill_fishing_base_level'),(688,'Command: reload skinning_loot_template'),(689,'Command: reload smart_scripts'),(690,'Command: reload spell_required'),(691,'Command: reload spell_area'),(692,'Command: reload spell_bonus_data'),(693,'Command: reload spell_group'),(694,'Command: reload spell_learn_spell'),(695,'Command: reload spell_loot_template'),(696,'Command: reload spell_linked_spell'),(697,'Command: reload spell_pet_auras'),(698,'Command: character changeaccount'),(699,'Command: reload spell_proc'),(700,'Command: reload spell_scripts'),(701,'Command: reload spell_target_position'),(702,'Command: reload spell_threats'),(703,'Command: reload spell_group_stack_rules'),(704,'Command: reload trinity_string'),(705,'Command: reload warden_action'),(706,'Command: reload waypoint_scripts'),(707,'Command: reload waypoint_data'),(708,'Command: reload vehicle_accessory'),(709,'Command: reload vehicle_template_accessory'),(710,'Command: reset'),(711,'Command: reset achievements'),(712,'Command: reset honor'),(713,'Command: reset level'),(714,'Command: reset spells'),(715,'Command: reset stats'),(716,'Command: reset talents'),(717,'Command: reset all'),(718,'Command: server'),(719,'Command: server corpses'),(720,'Command: server exit'),(721,'Command: server idlerestart'),(722,'Command: server idlerestart cancel'),(723,'Command: server idleshutdown'),(724,'Command: server idleshutdown cancel'),(725,'Command: server info'),(726,'Command: server plimit'),(727,'Command: server restart'),(728,'Command: server restart cancel'),(729,'Command: server set'),(730,'Command: server set closed'),(731,'Command: server set difftime'),(732,'Command: server set loglevel'),(733,'Command: server set motd'),(734,'Command: server shutdown'),(735,'Command: server shutdown cancel'),(736,'Command: server motd'),(737,'Command: tele'),(738,'Command: tele add'),(739,'Command: tele del'),(740,'Command: tele name'),(741,'Command: tele group'),(742,'Command: ticket'),(743,'Command: ticket assign'),(744,'Command: ticket close'),(745,'Command: ticket closedlist'),(746,'Command: ticket comment'),(747,'Command: ticket complete'),(748,'Command: ticket delete'),(749,'Command: ticket escalate'),(750,'Command: ticket escalatedlist'),(751,'Command: ticket list'),(752,'Command: ticket onlinelist'),(753,'Command: ticket reset'),(754,'Command: ticket response'),(755,'Command: ticket response append'),(756,'Command: ticket response appendln'),(757,'Command: ticket togglesystem'),(758,'Command: ticket unassign'),(759,'Command: ticket viewid'),(760,'Command: ticket viewname'),(761,'Command: titles'),(762,'Command: titles add'),(763,'Command: titles current'),(764,'Command: titles remove'),(765,'Command: titles set'),(766,'Command: titles set mask'),(767,'Command: wp'),(768,'Command: wp add'),(769,'Command: wp event'),(770,'Command: wp load'),(771,'Command: wp modify'),(772,'Command: wp unload'),(773,'Command: wp reload'),(774,'Command: wp show'),(777,'Command: mailbox'),(778,'Command: ahbot'),(779,'Command: ahbot items'),(780,'Command: ahbot items gray'),(781,'Command: ahbot items white'),(782,'Command: ahbot items green'),(783,'Command: ahbot items blue'),(784,'Command: ahbot items purple'),(785,'Command: ahbot items orange'),(786,'Command: ahbot items yellow'),(787,'Command: ahbot ratio'),(788,'Command: ahbot ratio alliance'),(789,'Command: ahbot ratio horde'),(790,'Command: ahbot ratio neutral'),(791,'Command: ahbot rebuild'),(792,'Command: ahbot reload'),(793,'Command: ahbot status'),(794,'Command: .guild info'),(795,'Command: .instance setbossstate'),(796,'Command: instance getbossstate'),(797,'Command: pvpstats'),(798,'Command: .mod xp'),(835,'Command: debug loadcells'),(836,'Command: .debug boundary'),(837,'Command: .npc evade'),(838,'Command: .pet level'),(839,'Command: .server shutdown force'),(840,'Command: .server restart force'),(841,'Command: .debug neargraveyard'),(852,'Command: go offset');
 /*!40000 ALTER TABLE `rbac_permissions` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -459,7 +459,7 @@ CREATE TABLE `realmlist` (
 
 LOCK TABLES `realmlist` WRITE;
 /*!40000 ALTER TABLE `realmlist` DISABLE KEYS */;
-INSERT INTO `realmlist` VALUES (1,'Trinity','127.0.0.1','127.0.0.1','255.255.255.0',8085,0,0,1,0,0,12340);
+INSERT INTO `realmlist` VALUES (1,'Trinity','127.0.0.1','127.0.0.1','255.255.255.0',8085,0,2,1,0,0,12340);
 /*!40000 ALTER TABLE `realmlist` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -486,7 +486,7 @@ CREATE TABLE `updates` (
 
 LOCK TABLES `updates` WRITE;
 /*!40000 ALTER TABLE `updates` DISABLE KEYS */;
-INSERT INTO `updates` VALUES ('2014_11_10_00_auth.sql','0E3CB119442D09DD88E967015319BBC8DAFBBFE0','ARCHIVED','2015-03-21 21:44:12',0),('2014_11_10_01_auth.sql','327E77A1DA3546D5275AB249915DD57EDD6FDD3D','ARCHIVED','2015-03-21 21:44:12',0),('2014_12_10_00_auth.sql','821703A96D80F9080074852B5A46E2909C9562EA','ARCHIVED','2015-03-21 21:44:12',0),('2014_12_21_00_auth.sql','CE2E5D2CD82E79C25294539ADED27A1429105B43','ARCHIVED','2015-03-21 21:44:12',0),('2015_03_20_00_auth.sql','E8C5B74BB45F0F35DEC182C72BACF435C7066FB0','ARCHIVED','2015-03-21 21:44:12',0),('2015_03_20_01_auth.sql','862961815354DA2746F5F71FBC8155F57CBE75AB','ARCHIVED','2015-03-21 21:44:12',0),('2015_03_20_02_auth.sql','33E4F94086590768EF5D4855DD43D7DE7C06ADA4','ARCHIVED','2015-03-21 21:44:51',0),('2015_08_21_00_auth.sql','C31A9E1D28E11B60BE8F8198637DD51F6D75123F','ARCHIVED','2015-10-05 23:16:19',0),('2015_11_07_00_auth.sql','0ACDD35EC9745231BCFA701B78056DEF94D0CC53','ARCHIVED','2016-04-11 00:42:36',92),('2016_01_13_00_auth.sql','24615CC69B3CD7BB4699874647C35BA86E8A93FD','ARCHIVED','2016-01-13 00:00:00',0),('2016_04_11_00_auth.sql','0ACDD35EC9745231BCFA701B78056DEF94D0CC53','ARCHIVED','2016-04-11 03:18:17',0),('2016_05_11_00_auth.sql','95B66235B8D67BF1CA216EB09F313C1F8F393B47','ARCHIVED','2016-04-16 13:17:11',0),('2016_06_06_00_auth.sql','A0A8D73A952D0618833416513D53F73A70E7EA25','ARCHIVED','2016-10-16 13:42:31',45),('2016_09_22_00_auth.sql','70047954E3556BFA430ADD5680EF8797F74A4B9E','ARCHIVED','2016-09-22 00:00:00',0),('2016_10_16_00_auth.sql','0ACDD35EC9745231BCFA701B78056DEF94D0CC53','RELEASED','2016-10-16 14:02:49',31),('2017_01_06_00_auth.sql','6CCFE6A9774EC733C9863D36A0F15F3534189BBD','RELEASED','2017-01-06 05:34:00',0),('2017_01_08_00_auth.sql','A68511D0BF94C41F720A11B630CCB36BBEA6B17D','RELEASED','2017-01-08 03:21:00',0),('2017_02_06_00_auth_335.sql','612068198F744892ECC0ACFE3BDCB6D72995916E','RELEASED','2017-02-06 00:00:00',0),('2017_03_17_00_auth.sql','4902E9B1B063F399F928C2DD7AFD60427738E227','RELEASED','2017-03-17 18:58:01',0);
+INSERT INTO `updates` VALUES ('2014_11_10_00_auth.sql','0E3CB119442D09DD88E967015319BBC8DAFBBFE0','ARCHIVED','2015-03-21 21:44:12',0),('2014_11_10_01_auth.sql','327E77A1DA3546D5275AB249915DD57EDD6FDD3D','ARCHIVED','2015-03-21 21:44:12',0),('2014_12_10_00_auth.sql','821703A96D80F9080074852B5A46E2909C9562EA','ARCHIVED','2015-03-21 21:44:12',0),('2014_12_21_00_auth.sql','CE2E5D2CD82E79C25294539ADED27A1429105B43','ARCHIVED','2015-03-21 21:44:12',0),('2015_03_20_00_auth.sql','E8C5B74BB45F0F35DEC182C72BACF435C7066FB0','ARCHIVED','2015-03-21 21:44:12',0),('2015_03_20_01_auth.sql','862961815354DA2746F5F71FBC8155F57CBE75AB','ARCHIVED','2015-03-21 21:44:12',0),('2015_03_20_02_auth.sql','33E4F94086590768EF5D4855DD43D7DE7C06ADA4','ARCHIVED','2015-03-21 21:44:51',0),('2015_08_21_00_auth.sql','C31A9E1D28E11B60BE8F8198637DD51F6D75123F','ARCHIVED','2015-10-05 23:16:19',0),('2015_11_07_00_auth.sql','0ACDD35EC9745231BCFA701B78056DEF94D0CC53','ARCHIVED','2016-04-11 00:42:36',92),('2016_01_13_00_auth.sql','24615CC69B3CD7BB4699874647C35BA86E8A93FD','ARCHIVED','2016-01-13 00:00:00',0),('2016_04_11_00_auth.sql','0ACDD35EC9745231BCFA701B78056DEF94D0CC53','ARCHIVED','2016-04-11 03:18:17',0),('2016_05_11_00_auth.sql','95B66235B8D67BF1CA216EB09F313C1F8F393B47','ARCHIVED','2016-04-16 13:17:11',0),('2016_06_06_00_auth.sql','A0A8D73A952D0618833416513D53F73A70E7EA25','ARCHIVED','2016-10-16 13:42:31',45),('2016_09_22_00_auth.sql','70047954E3556BFA430ADD5680EF8797F74A4B9E','ARCHIVED','2016-09-22 00:00:00',0),('2016_10_16_00_auth.sql','0ACDD35EC9745231BCFA701B78056DEF94D0CC53','ARCHIVED','2016-10-16 14:02:49',31),('2017_01_06_00_auth.sql','6CCFE6A9774EC733C9863D36A0F15F3534189BBD','ARCHIVED','2017-01-06 05:34:00',0),('2017_01_08_00_auth.sql','A68511D0BF94C41F720A11B630CCB36BBEA6B17D','ARCHIVED','2017-01-08 03:21:00',0),('2017_02_06_00_auth_335.sql','612068198F744892ECC0ACFE3BDCB6D72995916E','ARCHIVED','2017-02-06 00:00:00',0),('2017_03_17_00_auth.sql','4902E9B1B063F399F928C2DD7AFD60427738E227','ARCHIVED','2017-03-17 18:58:01',0),('2017_04_19_00_auth.sql','EAE1C1D3AA752259785C056A8F18515E1EF32BC9','RELEASED','2017-04-19 00:07:40',32);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -549,4 +549,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2016-10-16 15:05:25
+-- Dump completed on 2017-04-19  1:08:18
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
index caa9e5a93ac..7bbaa52bbd8 100644
--- a/sql/base/characters_database.sql
+++ b/sql/base/characters_database.sql
@@ -2568,7 +2568,7 @@ CREATE TABLE `updates` (
 
 LOCK TABLES `updates` WRITE;
 /*!40000 ALTER TABLE `updates` DISABLE KEYS */;
-INSERT INTO `updates` VALUES ('2015_03_20_00_characters.sql','B761760804EA73BD297F296C5C1919687DF7191C','ARCHIVED','2015-03-21 21:44:15',0),('2015_03_20_01_characters.sql','894F08B70449A5481FFAF394EE5571D7FC4D8A3A','ARCHIVED','2015-03-21 21:44:15',0),('2015_03_20_02_characters.sql','97D7BE0CAADC79F3F11B9FD296B8C6CD40FE593B','ARCHIVED','2015-03-21 21:44:51',0),('2015_06_26_00_characters_335.sql','C2CC6E50AFA1ACCBEBF77CC519AAEB09F3BBAEBC','ARCHIVED','2015-07-13 23:49:22',0),('2015_09_28_00_characters_335.sql','F8682A431D50E54BDC4AC0E7DBED21AE8AAB6AD4','ARCHIVED','2015-09-28 21:00:00',0),('2015_08_26_00_characters_335.sql','C7D6A3A00FECA3EBFF1E71744CA40D3076582374','ARCHIVED','2015-08-26 21:00:00',0),('2015_10_06_00_characters.sql','16842FDD7E8547F2260D3312F53EFF8761EFAB35','ARCHIVED','2015-10-06 16:06:38',0),('2015_10_07_00_characters.sql','E15AB463CEBE321001D7BFDEA4B662FF618728FD','ARCHIVED','2015-10-07 23:32:00',0),('2015_10_12_00_characters.sql','D6F9927BDED72AD0A81D6EC2C6500CBC34A39FA2','ARCHIVED','2015-10-12 15:35:47',0),('2015_10_28_00_characters.sql','622A9CA8FCE690429EBE23BA071A37C7A007BF8B','ARCHIVED','2015-10-19 14:32:22',0),('2015_10_29_00_characters_335.sql','4555A7F35C107E54C13D74D20F141039ED42943E','ARCHIVED','2015-10-29 17:05:43',0),('2015_11_03_00_characters.sql','CC045717B8FDD9733351E52A5302560CD08AAD57','ARCHIVED','2015-10-12 15:23:33',0),('2015_11_07_00_characters.sql','0ACDD35EC9745231BCFA701B78056DEF94D0CC53','ARCHIVED','2016-04-11 00:42:36',94),('2016_02_10_00_characters.sql','F1B4DA202819CABC7319A4470A2D224A34609E97','ARCHIVED','2016-02-10 00:00:00',0),('2016_03_13_2016_01_05_00_characters.sql','0EAD24977F40DE2476B4567DA2B477867CC0DA1A','ARCHIVED','2016-03-13 20:03:56',0),('2016_04_11_00_characters.sql','0ACDD35EC9745231BCFA701B78056DEF94D0CC53','ARCHIVED','2016-04-11 03:18:17',0),('2016_09_13_00_characters.sql','27A04615B11B2CFC3A26778F52F74C071E4F9C54','ARCHIVED','2016-07-06 18:55:18',0),('2016_10_16_00_characters.sql','0ACDD35EC9745231BCFA701B78056DEF94D0CC53','ARCHIVED','2016-10-16 14:02:49',35),('2016_10_30_00_characters.sql','7E2D5B226907B5A9AF320797F46E86DC27B7EC90','ARCHIVED','2016-10-30 00:00:00',0),('2017_04_03_00_characters.sql','CB072C56692C9FBF170C4036F15773DD86D368B5','RELEASED','2017-04-03 00:00:00',0),('2017_04_12_00_characters.sql','4FE3C6866A6DCD4926D451F6009464D290C2EF1F','RELEASED','2017-04-12 00:00:00',0),('2017_04_12_01_characters.sql','5A8A1215E3A2356722F52CD7A64BBE03D21FBEA3','RELEASED','2017-04-12 00:00:00',0);
+INSERT INTO `updates` VALUES ('2015_03_20_00_characters.sql','B761760804EA73BD297F296C5C1919687DF7191C','ARCHIVED','2015-03-21 21:44:15',0),('2015_03_20_01_characters.sql','894F08B70449A5481FFAF394EE5571D7FC4D8A3A','ARCHIVED','2015-03-21 21:44:15',0),('2015_03_20_02_characters.sql','97D7BE0CAADC79F3F11B9FD296B8C6CD40FE593B','ARCHIVED','2015-03-21 21:44:51',0),('2015_06_26_00_characters_335.sql','C2CC6E50AFA1ACCBEBF77CC519AAEB09F3BBAEBC','ARCHIVED','2015-07-13 23:49:22',0),('2015_09_28_00_characters_335.sql','F8682A431D50E54BDC4AC0E7DBED21AE8AAB6AD4','ARCHIVED','2015-09-28 21:00:00',0),('2015_08_26_00_characters_335.sql','C7D6A3A00FECA3EBFF1E71744CA40D3076582374','ARCHIVED','2015-08-26 21:00:00',0),('2015_10_06_00_characters.sql','16842FDD7E8547F2260D3312F53EFF8761EFAB35','ARCHIVED','2015-10-06 16:06:38',0),('2015_10_07_00_characters.sql','E15AB463CEBE321001D7BFDEA4B662FF618728FD','ARCHIVED','2015-10-07 23:32:00',0),('2015_10_12_00_characters.sql','D6F9927BDED72AD0A81D6EC2C6500CBC34A39FA2','ARCHIVED','2015-10-12 15:35:47',0),('2015_10_28_00_characters.sql','622A9CA8FCE690429EBE23BA071A37C7A007BF8B','ARCHIVED','2015-10-19 14:32:22',0),('2015_10_29_00_characters_335.sql','4555A7F35C107E54C13D74D20F141039ED42943E','ARCHIVED','2015-10-29 17:05:43',0),('2015_11_03_00_characters.sql','CC045717B8FDD9733351E52A5302560CD08AAD57','ARCHIVED','2015-10-12 15:23:33',0),('2015_11_07_00_characters.sql','0ACDD35EC9745231BCFA701B78056DEF94D0CC53','ARCHIVED','2016-04-11 00:42:36',94),('2016_02_10_00_characters.sql','F1B4DA202819CABC7319A4470A2D224A34609E97','ARCHIVED','2016-02-10 00:00:00',0),('2016_03_13_2016_01_05_00_characters.sql','0EAD24977F40DE2476B4567DA2B477867CC0DA1A','ARCHIVED','2016-03-13 20:03:56',0),('2016_04_11_00_characters.sql','0ACDD35EC9745231BCFA701B78056DEF94D0CC53','ARCHIVED','2016-04-11 03:18:17',0),('2016_09_13_00_characters.sql','27A04615B11B2CFC3A26778F52F74C071E4F9C54','ARCHIVED','2016-07-06 18:55:18',0),('2016_10_16_00_characters.sql','0ACDD35EC9745231BCFA701B78056DEF94D0CC53','ARCHIVED','2016-10-16 14:02:49',35),('2016_10_30_00_characters.sql','7E2D5B226907B5A9AF320797F46E86DC27B7EC90','ARCHIVED','2016-10-30 00:00:00',0),('2017_04_03_00_characters.sql','CB072C56692C9FBF170C4036F15773DD86D368B5','ARCHIVED','2017-04-03 00:00:00',0),('2017_04_12_00_characters.sql','4FE3C6866A6DCD4926D451F6009464D290C2EF1F','ARCHIVED','2017-04-12 00:00:00',0),('2017_04_12_01_characters.sql','5A8A1215E3A2356722F52CD7A64BBE03D21FBEA3','ARCHIVED','2017-04-12 00:00:00',0),('2017_04_19_00_characters.sql','CE06FA9005C8A8EE4BDD925520278A5D83E87485','RELEASED','2017-04-19 00:07:40',25);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2653,4 +2653,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2016-10-16 15:05:25
+-- Dump completed on 2017-04-19  1:08:18
diff --git a/sql/base/dev/DO_NOT_IMPORT_THESE_FILES.txt b/sql/base/dev/DO_NOT_IMPORT_THESE_FILES.txt
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/sql/base/dev/DO_NOT_IMPORT_THESE_FILES.txt
diff --git a/sql/base/dev/README.TXT b/sql/base/dev/README.TXT
deleted file mode 100644
index 2717026f35b..00000000000
--- a/sql/base/dev/README.TXT
+++ /dev/null
@@ -1 +0,0 @@
-The file world_database.sql is intended to be used only by travis compile test system, don't import it, you will break your core.
diff --git a/sql/base/dev/world_database.sql b/sql/base/dev/world_database.sql
index 67439898760..a3da3422d07 100644
--- a/sql/base/dev/world_database.sql
+++ b/sql/base/dev/world_database.sql
@@ -295,6 +295,7 @@ CREATE TABLE `creature` (
   `npcflag` int(10) unsigned NOT NULL DEFAULT '0',
   `unit_flags` int(10) unsigned NOT NULL DEFAULT '0',
   `dynamicflags` int(10) unsigned NOT NULL DEFAULT '0',
+  `ScriptName` char(64) DEFAULT '',
   `VerifiedBuild` smallint(5) DEFAULT '0',
   PRIMARY KEY (`guid`),
   KEY `idx_map` (`map`),
@@ -1062,6 +1063,7 @@ CREATE TABLE `gameobject` (
   `spawntimesecs` int(11) NOT NULL DEFAULT '0',
   `animprogress` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `state` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ScriptName` char(64) DEFAULT '',
   `VerifiedBuild` smallint(5) DEFAULT '0',
   PRIMARY KEY (`guid`)
 ) ENGINE=MyISAM AUTO_INCREMENT=255094 DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Gameobject System';
@@ -1886,48 +1888,6 @@ CREATE TABLE `locales_npc_text` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `locales_page_text`
---
-
-DROP TABLE IF EXISTS `locales_page_text`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `locales_page_text` (
-  `entry` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `Text_loc1` longtext,
-  `Text_loc2` longtext,
-  `Text_loc3` longtext,
-  `Text_loc4` longtext,
-  `Text_loc5` longtext,
-  `Text_loc6` longtext,
-  `Text_loc7` longtext,
-  `Text_loc8` longtext,
-  PRIMARY KEY (`entry`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `locales_points_of_interest`
---
-
-DROP TABLE IF EXISTS `locales_points_of_interest`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `locales_points_of_interest` (
-  `entry` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `icon_name_loc1` text,
-  `icon_name_loc2` text,
-  `icon_name_loc3` text,
-  `icon_name_loc4` text,
-  `icon_name_loc5` text,
-  `icon_name_loc6` text,
-  `icon_name_loc7` text,
-  `icon_name_loc8` text,
-  PRIMARY KEY (`entry`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
 -- Table structure for table `locales_quest`
 --
 
@@ -2277,6 +2237,22 @@ CREATE TABLE `page_text` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `page_text_locale`
+--
+
+DROP TABLE IF EXISTS `page_text_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `page_text_locale` (
+  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `Text` text,
+  `VerifiedBuild` smallint(5) DEFAULT '0',
+  PRIMARY KEY (`ID`,`locale`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `pet_levelstats`
 --
 
@@ -2592,7 +2568,7 @@ CREATE TABLE `points_of_interest` (
   `PositionY` float NOT NULL DEFAULT '0',
   `Icon` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `Flags` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `Data` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `Importance` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `Name` text NOT NULL,
   `VerifiedBuild` smallint(5) DEFAULT '0',
   PRIMARY KEY (`ID`)
@@ -2600,6 +2576,22 @@ CREATE TABLE `points_of_interest` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `points_of_interest_locale`
+--
+
+DROP TABLE IF EXISTS `points_of_interest_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `points_of_interest_locale` (
+  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `Name` text,
+  `VerifiedBuild` smallint(5) DEFAULT '0',
+  PRIMARY KEY (`ID`,`locale`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `pool_creature`
 --
 
@@ -2949,7 +2941,7 @@ CREATE TABLE `quest_template_addon` (
   `AllowableClasses` int(10) unsigned NOT NULL DEFAULT '0',
   `SourceSpellID` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `PrevQuestID` mediumint(8) NOT NULL DEFAULT '0',
-  `NextQuestID` mediumint(8) NOT NULL DEFAULT '0',
+  `NextQuestID` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `ExclusiveGroup` mediumint(8) NOT NULL DEFAULT '0',
   `RewardMailTemplateID` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `RewardMailDelay` int(10) unsigned NOT NULL DEFAULT '0',
@@ -3184,9 +3176,9 @@ CREATE TABLE `smart_scripts` (
   `id` smallint(5) unsigned NOT NULL DEFAULT '0',
   `link` smallint(5) unsigned NOT NULL DEFAULT '0',
   `event_type` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `event_phase_mask` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `event_phase_mask` smallint(5) unsigned NOT NULL DEFAULT '0',
   `event_chance` tinyint(3) unsigned NOT NULL DEFAULT '100',
-  `event_flags` smallint(3) unsigned NOT NULL DEFAULT '0',
+  `event_flags` smallint(5) unsigned NOT NULL DEFAULT '0',
   `event_param1` int(10) unsigned NOT NULL DEFAULT '0',
   `event_param2` int(10) unsigned NOT NULL DEFAULT '0',
   `event_param3` int(10) unsigned NOT NULL DEFAULT '0',
@@ -3381,11 +3373,12 @@ DROP TABLE IF EXISTS `spell_enchant_proc_data`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `spell_enchant_proc_data` (
-  `entry` int(10) unsigned NOT NULL,
-  `customChance` int(10) unsigned NOT NULL DEFAULT '0',
-  `PPMChance` float unsigned NOT NULL DEFAULT '0',
-  `procEx` int(10) unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (`entry`)
+  `EnchantID` int(10) unsigned NOT NULL,
+  `Chance` float NOT NULL DEFAULT '0',
+  `ProcsPerMinute` float NOT NULL DEFAULT '0',
+  `HitMask` int(10) unsigned NOT NULL DEFAULT '0',
+  `AttributesMask` int(10) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`EnchantID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Spell enchant proc data';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -3794,7 +3787,7 @@ CREATE TABLE `waypoint_data` (
   `move_type` int(11) NOT NULL DEFAULT '0',
   `action` int(11) NOT NULL DEFAULT '0',
   `action_chance` smallint(6) NOT NULL DEFAULT '100',
-  `wpguid` int(11) NOT NULL DEFAULT '0',
+  `wpguid` int(11) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`,`point`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -3849,4 +3842,4 @@ CREATE TABLE `waypoints` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2016-10-16 15:05:26
+-- Dump completed on 2017-04-19  1:08:19
diff --git a/sql/updates/auth/3.3.5/2016_10_16_00_auth.sql b/sql/old/3.3.5a/auth/62_2017_04_18/2016_10_16_00_auth.sql
index be8a4d21b66..be8a4d21b66 100644
--- a/sql/updates/auth/3.3.5/2016_10_16_00_auth.sql
+++ b/sql/old/3.3.5a/auth/62_2017_04_18/2016_10_16_00_auth.sql
diff --git a/sql/updates/auth/3.3.5/2017_01_06_00_auth.sql b/sql/old/3.3.5a/auth/62_2017_04_18/2017_01_06_00_auth.sql
index 0def4608ca2..0def4608ca2 100644
--- a/sql/updates/auth/3.3.5/2017_01_06_00_auth.sql
+++ b/sql/old/3.3.5a/auth/62_2017_04_18/2017_01_06_00_auth.sql
diff --git a/sql/updates/auth/3.3.5/2017_01_08_00_auth.sql b/sql/old/3.3.5a/auth/62_2017_04_18/2017_01_08_00_auth.sql
index 598fc89488b..598fc89488b 100644
--- a/sql/updates/auth/3.3.5/2017_01_08_00_auth.sql
+++ b/sql/old/3.3.5a/auth/62_2017_04_18/2017_01_08_00_auth.sql
diff --git a/sql/updates/auth/3.3.5/2017_02_06_00_auth_335.sql b/sql/old/3.3.5a/auth/62_2017_04_18/2017_02_06_00_auth_335.sql
index 987072ba8f5..987072ba8f5 100644
--- a/sql/updates/auth/3.3.5/2017_02_06_00_auth_335.sql
+++ b/sql/old/3.3.5a/auth/62_2017_04_18/2017_02_06_00_auth_335.sql
diff --git a/sql/updates/auth/3.3.5/2017_03_17_00_auth.sql b/sql/old/3.3.5a/auth/62_2017_04_18/2017_03_17_00_auth.sql
index 3c0f547fcbe..3c0f547fcbe 100644
--- a/sql/updates/auth/3.3.5/2017_03_17_00_auth.sql
+++ b/sql/old/3.3.5a/auth/62_2017_04_18/2017_03_17_00_auth.sql
diff --git a/sql/updates/characters/3.3.5/2016_10_16_00_characters.sql b/sql/old/3.3.5a/characters/62_2017_04_18/2016_10_16_00_characters.sql
index be8a4d21b66..be8a4d21b66 100644
--- a/sql/updates/characters/3.3.5/2016_10_16_00_characters.sql
+++ b/sql/old/3.3.5a/characters/62_2017_04_18/2016_10_16_00_characters.sql
diff --git a/sql/updates/characters/3.3.5/2016_10_30_00_characters.sql b/sql/old/3.3.5a/characters/62_2017_04_18/2016_10_30_00_characters.sql
index f72e8c32e22..f72e8c32e22 100644
--- a/sql/updates/characters/3.3.5/2016_10_30_00_characters.sql
+++ b/sql/old/3.3.5a/characters/62_2017_04_18/2016_10_30_00_characters.sql
diff --git a/sql/updates/characters/3.3.5/2017_04_03_00_characters.sql b/sql/old/3.3.5a/characters/62_2017_04_18/2017_04_03_00_characters.sql
index 8519bd94556..8519bd94556 100644
--- a/sql/updates/characters/3.3.5/2017_04_03_00_characters.sql
+++ b/sql/old/3.3.5a/characters/62_2017_04_18/2017_04_03_00_characters.sql
diff --git a/sql/updates/characters/3.3.5/2017_04_12_00_characters.sql b/sql/old/3.3.5a/characters/62_2017_04_18/2017_04_12_00_characters.sql
index 117e3baa78d..117e3baa78d 100644
--- a/sql/updates/characters/3.3.5/2017_04_12_00_characters.sql
+++ b/sql/old/3.3.5a/characters/62_2017_04_18/2017_04_12_00_characters.sql
diff --git a/sql/updates/characters/3.3.5/2017_04_12_01_characters.sql b/sql/old/3.3.5a/characters/62_2017_04_18/2017_04_12_01_characters.sql
index ed5617d2750..ed5617d2750 100644
--- a/sql/updates/characters/3.3.5/2017_04_12_01_characters.sql
+++ b/sql/old/3.3.5a/characters/62_2017_04_18/2017_04_12_01_characters.sql
diff --git a/sql/updates/world/3.3.5/2016_10_17_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_17_00_world.sql
index 0e710195729..0e710195729 100644
--- a/sql/updates/world/3.3.5/2016_10_17_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_17_00_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_17_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_17_01_world.sql
index 995e9ad75ba..995e9ad75ba 100644
--- a/sql/updates/world/3.3.5/2016_10_17_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_17_01_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_17_02_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_17_02_world_335.sql
index fb3d504ba26..fb3d504ba26 100644
--- a/sql/updates/world/3.3.5/2016_10_17_02_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_17_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_10_17_03_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_17_03_world_335.sql
index 2965f05aa72..2965f05aa72 100644
--- a/sql/updates/world/3.3.5/2016_10_17_03_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_17_03_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_10_17_04_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_17_04_world_335.sql
index 0e6b0c4717f..0e6b0c4717f 100644
--- a/sql/updates/world/3.3.5/2016_10_17_04_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_17_04_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_10_17_05_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_17_05_world_335.sql
index f5ec0202d2d..f5ec0202d2d 100644
--- a/sql/updates/world/3.3.5/2016_10_17_05_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_17_05_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_10_17_06_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_17_06_world.sql
index b6df3a1991b..b6df3a1991b 100644
--- a/sql/updates/world/3.3.5/2016_10_17_06_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_17_06_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_17_07_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_17_07_world_335.sql
index 00ed0d1d413..00ed0d1d413 100644
--- a/sql/updates/world/3.3.5/2016_10_17_07_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_17_07_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_10_18_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_18_00_world.sql
index 711ca05eb0c..711ca05eb0c 100644
--- a/sql/updates/world/3.3.5/2016_10_18_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_18_00_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_18_01_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_18_01_world_335.sql
index 067350cb3ef..067350cb3ef 100644
--- a/sql/updates/world/3.3.5/2016_10_18_01_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_18_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_10_18_02_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_18_02_world.sql
index f0a9902846c..f0a9902846c 100644
--- a/sql/updates/world/3.3.5/2016_10_18_02_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_18_02_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_18_03_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_18_03_world_335.sql
index 2655317d4b8..2655317d4b8 100644
--- a/sql/updates/world/3.3.5/2016_10_18_03_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_18_03_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_10_18_04_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_18_04_world_335.sql
index 3eba72886f2..3eba72886f2 100644
--- a/sql/updates/world/3.3.5/2016_10_18_04_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_18_04_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_10_18_05_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_18_05_world_335.sql
index 895253f421d..895253f421d 100644
--- a/sql/updates/world/3.3.5/2016_10_18_05_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_18_05_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_10_18_06_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_18_06_world_335.sql
index e9e7968df08..e9e7968df08 100644
--- a/sql/updates/world/3.3.5/2016_10_18_06_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_18_06_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_10_18_07_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_18_07_world_335.sql
index 07391ab5034..07391ab5034 100644
--- a/sql/updates/world/3.3.5/2016_10_18_07_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_18_07_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_10_18_08_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_18_08_world_335.sql
index d0fb050aa62..d0fb050aa62 100644
--- a/sql/updates/world/3.3.5/2016_10_18_08_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_18_08_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_10_19_00_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_19_00_world_335.sql
index ef769535f36..ef769535f36 100644
--- a/sql/updates/world/3.3.5/2016_10_19_00_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_19_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_10_20_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_20_00_world.sql
index d2db94033ab..d2db94033ab 100644
--- a/sql/updates/world/3.3.5/2016_10_20_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_20_00_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_21_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_21_00_world.sql
index 00c773e398e..00c773e398e 100644
--- a/sql/updates/world/3.3.5/2016_10_21_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_21_00_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_21_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_21_01_world.sql
index 3753e8fd9c7..3753e8fd9c7 100644
--- a/sql/updates/world/3.3.5/2016_10_21_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_21_01_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_21_02_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_21_02_world.sql
index ce000dacadd..ce000dacadd 100644
--- a/sql/updates/world/3.3.5/2016_10_21_02_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_21_02_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_22_00_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_22_00_world_335.sql
index 4b78ebc65bd..4b78ebc65bd 100644
--- a/sql/updates/world/3.3.5/2016_10_22_00_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_22_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_10_23_00_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_23_00_world_335.sql
index 2d4ba2f10be..2d4ba2f10be 100644
--- a/sql/updates/world/3.3.5/2016_10_23_00_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_23_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_10_25_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_25_00_world.sql
index 5acfd2bdcd0..5acfd2bdcd0 100644
--- a/sql/updates/world/3.3.5/2016_10_25_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_25_00_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_26_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_26_00_world.sql
index 15a1c9ccead..15a1c9ccead 100644
--- a/sql/updates/world/3.3.5/2016_10_26_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_26_00_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_26_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_26_01_world.sql
index b2782f6c395..b2782f6c395 100644
--- a/sql/updates/world/3.3.5/2016_10_26_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_26_01_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_26_02_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_26_02_world.sql
index 399d01b8db0..399d01b8db0 100644
--- a/sql/updates/world/3.3.5/2016_10_26_02_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_26_02_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_27_00_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_27_00_world_335.sql
index e68c77975f5..e68c77975f5 100644
--- a/sql/updates/world/3.3.5/2016_10_27_00_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_27_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_10_27_01_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_27_01_world_335.sql
index 2814e5606e2..2814e5606e2 100644
--- a/sql/updates/world/3.3.5/2016_10_27_01_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_27_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_10_27_02_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_27_02_world.sql
index 636fc78d01b..636fc78d01b 100644
--- a/sql/updates/world/3.3.5/2016_10_27_02_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_27_02_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_27_03_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_27_03_world.sql
index 9f793145936..9f793145936 100644
--- a/sql/updates/world/3.3.5/2016_10_27_03_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_27_03_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_27_04_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_27_04_world.sql
index 033680f233f..033680f233f 100644
--- a/sql/updates/world/3.3.5/2016_10_27_04_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_27_04_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_27_05_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_27_05_world.sql
index 1f61abb5658..1f61abb5658 100644
--- a/sql/updates/world/3.3.5/2016_10_27_05_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_27_05_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_27_06_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_27_06_world.sql
index 69cecfcad8a..69cecfcad8a 100644
--- a/sql/updates/world/3.3.5/2016_10_27_06_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_27_06_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_28_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_28_00_world.sql
index 64a7d3d6887..64a7d3d6887 100644
--- a/sql/updates/world/3.3.5/2016_10_28_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_28_00_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_28_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_28_01_world.sql
index bd5991062ca..bd5991062ca 100644
--- a/sql/updates/world/3.3.5/2016_10_28_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_28_01_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_28_02_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_28_02_world_335.sql
index 190f5c33a28..190f5c33a28 100644
--- a/sql/updates/world/3.3.5/2016_10_28_02_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_28_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_10_28_03_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_28_03_world_335.sql
index df414f4fe11..df414f4fe11 100644
--- a/sql/updates/world/3.3.5/2016_10_28_03_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_28_03_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_10_29_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_29_00_world.sql
index 16f6b661ea4..16f6b661ea4 100644
--- a/sql/updates/world/3.3.5/2016_10_29_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_29_00_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_29_01_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_29_01_world_335.sql
index 07b49a3d3f7..07b49a3d3f7 100644
--- a/sql/updates/world/3.3.5/2016_10_29_01_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_29_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_10_29_02_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_29_02_world.sql
index cab9bc5a167..cab9bc5a167 100644
--- a/sql/updates/world/3.3.5/2016_10_29_02_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_29_02_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_29_03_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_29_03_world.sql
index 7c21609205d..7c21609205d 100644
--- a/sql/updates/world/3.3.5/2016_10_29_03_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_29_03_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_29_04_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_29_04_world.sql
index 5bea6f0f8b2..5bea6f0f8b2 100644
--- a/sql/updates/world/3.3.5/2016_10_29_04_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_29_04_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_29_05_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_29_05_world.sql
index 1f923592dda..1f923592dda 100644
--- a/sql/updates/world/3.3.5/2016_10_29_05_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_29_05_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_29_06_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_29_06_world.sql
index 06c9251574c..06c9251574c 100644
--- a/sql/updates/world/3.3.5/2016_10_29_06_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_29_06_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_29_07_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_29_07_world.sql
index 8c020dc8fd8..8c020dc8fd8 100644
--- a/sql/updates/world/3.3.5/2016_10_29_07_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_29_07_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_30_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_30_00_world.sql
index 1a9e0188f38..1a9e0188f38 100644
--- a/sql/updates/world/3.3.5/2016_10_30_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_30_00_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_30_01_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_30_01_world_335.sql
index 45b2e08d52a..45b2e08d52a 100644
--- a/sql/updates/world/3.3.5/2016_10_30_01_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_30_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_10_30_02_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_30_02_world.sql
index 0d39b8eb6f9..0d39b8eb6f9 100644
--- a/sql/updates/world/3.3.5/2016_10_30_02_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_30_02_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_30_03_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_30_03_world.sql
index 7994cccdbd0..7994cccdbd0 100644
--- a/sql/updates/world/3.3.5/2016_10_30_03_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_30_03_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_30_04_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_30_04_world.sql
index 6c18ce15dde..6c18ce15dde 100644
--- a/sql/updates/world/3.3.5/2016_10_30_04_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_30_04_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_30_05_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_30_05_world_335.sql
index 9583fac21be..9583fac21be 100644
--- a/sql/updates/world/3.3.5/2016_10_30_05_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_30_05_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_10_30_06_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_30_06_world_335.sql
index ee3a62f15e1..ee3a62f15e1 100644
--- a/sql/updates/world/3.3.5/2016_10_30_06_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_30_06_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_10_30_07_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_30_07_world_335.sql
index 048613fc6b6..048613fc6b6 100644
--- a/sql/updates/world/3.3.5/2016_10_30_07_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_30_07_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_10_30_08_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_30_08_world.sql
index 0fd201e6cc8..0fd201e6cc8 100644
--- a/sql/updates/world/3.3.5/2016_10_30_08_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_30_08_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_31_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_31_00_world.sql
index 4b610eab05a..4b610eab05a 100644
--- a/sql/updates/world/3.3.5/2016_10_31_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_10_31_00_world.sql
diff --git a/sql/updates/world/3.3.5/2016_11_01_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_01_00_world.sql
index 8b1fd16d5fe..8b1fd16d5fe 100644
--- a/sql/updates/world/3.3.5/2016_11_01_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_01_00_world.sql
diff --git a/sql/updates/world/3.3.5/2016_11_01_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_01_01_world.sql
index d503bbf09cc..d503bbf09cc 100644
--- a/sql/updates/world/3.3.5/2016_11_01_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_01_01_world.sql
diff --git a/sql/updates/world/3.3.5/2016_11_01_02_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_01_02_world.sql
index bf37b2b41c7..bf37b2b41c7 100644
--- a/sql/updates/world/3.3.5/2016_11_01_02_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_01_02_world.sql
diff --git a/sql/updates/world/3.3.5/2016_11_01_03_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_01_03_world.sql
index da4a7cd1fa9..da4a7cd1fa9 100644
--- a/sql/updates/world/3.3.5/2016_11_01_03_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_01_03_world.sql
diff --git a/sql/updates/world/3.3.5/2016_11_01_04_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_01_04_world_335.sql
index 68c2840a74d..68c2840a74d 100644
--- a/sql/updates/world/3.3.5/2016_11_01_04_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_01_04_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_11_02_00_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_02_00_world_335.sql
index 86c433ef209..86c433ef209 100644
--- a/sql/updates/world/3.3.5/2016_11_02_00_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_02_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_11_02_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_02_01_world.sql
index d0d4b78c0c3..d0d4b78c0c3 100644
--- a/sql/updates/world/3.3.5/2016_11_02_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_02_01_world.sql
diff --git a/sql/updates/world/3.3.5/2016_11_02_02_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_02_02_world.sql
index 7002536a162..7002536a162 100644
--- a/sql/updates/world/3.3.5/2016_11_02_02_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_02_02_world.sql
diff --git a/sql/updates/world/3.3.5/2016_11_02_03_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_02_03_world_335.sql
index 35867518087..35867518087 100644
--- a/sql/updates/world/3.3.5/2016_11_02_03_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_02_03_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_11_03_00_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_03_00_world_335.sql
index 7e8ca72633d..7e8ca72633d 100644
--- a/sql/updates/world/3.3.5/2016_11_03_00_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_03_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_11_03_01_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_03_01_world_335.sql
index da07ba6f52c..da07ba6f52c 100644
--- a/sql/updates/world/3.3.5/2016_11_03_01_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_03_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_11_03_02_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_03_02_world_335.sql
index 0ce05e4dea4..0ce05e4dea4 100644
--- a/sql/updates/world/3.3.5/2016_11_03_02_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_03_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_11_03_03_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_03_03_world.sql
index 8a241142ce5..8a241142ce5 100644
--- a/sql/updates/world/3.3.5/2016_11_03_03_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_03_03_world.sql
diff --git a/sql/updates/world/3.3.5/2016_11_04_00_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_04_00_world_335.sql
index 3bea6eef633..3bea6eef633 100644
--- a/sql/updates/world/3.3.5/2016_11_04_00_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_04_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_11_04_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_04_01_world.sql
index 6013ea85556..6013ea85556 100644
--- a/sql/updates/world/3.3.5/2016_11_04_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_04_01_world.sql
diff --git a/sql/updates/world/3.3.5/2016_11_04_02_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_04_02_world.sql
index 8dd6cf4e1f1..8dd6cf4e1f1 100644
--- a/sql/updates/world/3.3.5/2016_11_04_02_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_04_02_world.sql
diff --git a/sql/updates/world/3.3.5/2016_11_07_00_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_07_00_world_335.sql
index 26a8e003a93..26a8e003a93 100644
--- a/sql/updates/world/3.3.5/2016_11_07_00_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_07_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_11_08_00_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_08_00_world_335.sql
index 50aece5916d..50aece5916d 100644
--- a/sql/updates/world/3.3.5/2016_11_08_00_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_08_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_11_08_01_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_08_01_world_335.sql
index ed1f09a4f2e..ed1f09a4f2e 100644
--- a/sql/updates/world/3.3.5/2016_11_08_01_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_08_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_11_09_00_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_09_00_world_335.sql
index dd7a82dfae2..dd7a82dfae2 100644
--- a/sql/updates/world/3.3.5/2016_11_09_00_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_09_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_11_09_01_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_09_01_world_335.sql
index 8e1ef6113de..8e1ef6113de 100644
--- a/sql/updates/world/3.3.5/2016_11_09_01_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_09_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_11_10_00_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_10_00_world_335.sql
index 430bae95863..430bae95863 100644
--- a/sql/updates/world/3.3.5/2016_11_10_00_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_10_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_11_10_01_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_10_01_world_335.sql
index b5fb32b9ceb..b5fb32b9ceb 100644
--- a/sql/updates/world/3.3.5/2016_11_10_01_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_10_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_11_12_00_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_12_00_world_335.sql
index 865683c3c68..865683c3c68 100644
--- a/sql/updates/world/3.3.5/2016_11_12_00_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_12_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_11_12_01_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_12_01_world_335.sql
index bc920b5e16e..bc920b5e16e 100644
--- a/sql/updates/world/3.3.5/2016_11_12_01_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_12_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_11_13_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_13_00_world.sql
index 7a19b8c13ce..7a19b8c13ce 100644
--- a/sql/updates/world/3.3.5/2016_11_13_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_13_00_world.sql
diff --git a/sql/updates/world/3.3.5/2016_11_14_00_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_14_00_world_335.sql
index 95112247b84..95112247b84 100644
--- a/sql/updates/world/3.3.5/2016_11_14_00_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_14_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_11_15_00_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_15_00_world_335.sql
index a3baf21d63a..a3baf21d63a 100644
--- a/sql/updates/world/3.3.5/2016_11_15_00_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_15_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_11_15_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_15_01_world.sql
index 5e35b61e237..5e35b61e237 100644
--- a/sql/updates/world/3.3.5/2016_11_15_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_15_01_world.sql
diff --git a/sql/updates/world/3.3.5/2016_11_16_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_16_00_world.sql
index 9a046d72499..9a046d72499 100644
--- a/sql/updates/world/3.3.5/2016_11_16_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_16_00_world.sql
diff --git a/sql/updates/world/3.3.5/2016_11_18_00_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_18_00_world_335.sql
index f37ce0b4df5..f37ce0b4df5 100644
--- a/sql/updates/world/3.3.5/2016_11_18_00_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_18_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_11_19_00_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_19_00_world_335.sql
index ae32a91d4d1..ae32a91d4d1 100644
--- a/sql/updates/world/3.3.5/2016_11_19_00_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_19_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_11_19_01_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_19_01_world_335.sql
index 2666b0984d8..2666b0984d8 100644
--- a/sql/updates/world/3.3.5/2016_11_19_01_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_19_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_11_19_02_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_19_02_world_335.sql
index dcf5398dfea..dcf5398dfea 100644
--- a/sql/updates/world/3.3.5/2016_11_19_02_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_19_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_11_20_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_20_00_world.sql
index 2326ec439a0..2326ec439a0 100644
--- a/sql/updates/world/3.3.5/2016_11_20_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_20_00_world.sql
diff --git a/sql/updates/world/3.3.5/2016_11_20_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_20_01_world.sql
index e93887bedc7..e93887bedc7 100644
--- a/sql/updates/world/3.3.5/2016_11_20_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_20_01_world.sql
diff --git a/sql/updates/world/3.3.5/2016_11_20_02_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_20_02_world.sql
index e0f92357706..e0f92357706 100644
--- a/sql/updates/world/3.3.5/2016_11_20_02_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_20_02_world.sql
diff --git a/sql/updates/world/3.3.5/2016_11_23_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_23_00_world.sql
index ccbb4b3a6cf..ccbb4b3a6cf 100644
--- a/sql/updates/world/3.3.5/2016_11_23_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_23_00_world.sql
diff --git a/sql/updates/world/3.3.5/2016_11_26_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_26_00_world.sql
index 67c687b1034..67c687b1034 100644
--- a/sql/updates/world/3.3.5/2016_11_26_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_26_00_world.sql
diff --git a/sql/updates/world/3.3.5/2016_11_26_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_26_01_world.sql
index 5a521526f62..5a521526f62 100644
--- a/sql/updates/world/3.3.5/2016_11_26_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_26_01_world.sql
diff --git a/sql/updates/world/3.3.5/2016_11_26_02_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_26_02_world.sql
index b9cdadf6bf7..b9cdadf6bf7 100644
--- a/sql/updates/world/3.3.5/2016_11_26_02_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_26_02_world.sql
diff --git a/sql/updates/world/3.3.5/2016_11_26_03_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_26_03_world.sql
index 36882e654c8..36882e654c8 100644
--- a/sql/updates/world/3.3.5/2016_11_26_03_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_26_03_world.sql
diff --git a/sql/updates/world/3.3.5/2016_11_26_04_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_26_04_world.sql
index bac834aa589..bac834aa589 100644
--- a/sql/updates/world/3.3.5/2016_11_26_04_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_26_04_world.sql
diff --git a/sql/updates/world/3.3.5/2016_11_26_05_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_26_05_world.sql
index 47084ba5d09..47084ba5d09 100644
--- a/sql/updates/world/3.3.5/2016_11_26_05_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_26_05_world.sql
diff --git a/sql/updates/world/3.3.5/2016_11_26_06_world335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_26_06_world335.sql
index b80c978ee43..b80c978ee43 100644
--- a/sql/updates/world/3.3.5/2016_11_26_06_world335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_26_06_world335.sql
diff --git a/sql/updates/world/3.3.5/2016_11_26_07_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_26_07_world.sql
index 3a6457edabd..3a6457edabd 100644
--- a/sql/updates/world/3.3.5/2016_11_26_07_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_26_07_world.sql
diff --git a/sql/updates/world/3.3.5/2016_11_26_08_world335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_26_08_world335.sql
index e97774cdab8..e97774cdab8 100644
--- a/sql/updates/world/3.3.5/2016_11_26_08_world335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_26_08_world335.sql
diff --git a/sql/updates/world/3.3.5/2016_11_26_09_world335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_26_09_world335.sql
index 9b57c0bb58a..9b57c0bb58a 100644
--- a/sql/updates/world/3.3.5/2016_11_26_09_world335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_26_09_world335.sql
diff --git a/sql/updates/world/3.3.5/2016_11_27_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_27_00_world.sql
index efa02ea8baf..efa02ea8baf 100644
--- a/sql/updates/world/3.3.5/2016_11_27_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_27_00_world.sql
diff --git a/sql/updates/world/3.3.5/2016_11_27_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_27_01_world.sql
index f41808e3344..f41808e3344 100644
--- a/sql/updates/world/3.3.5/2016_11_27_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_27_01_world.sql
diff --git a/sql/updates/world/3.3.5/2016_11_27_02_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_27_02_world.sql
index 425ee9ee931..425ee9ee931 100644
--- a/sql/updates/world/3.3.5/2016_11_27_02_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_27_02_world.sql
diff --git a/sql/updates/world/3.3.5/2016_11_27_03_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_27_03_world.sql
index 70969fd5555..70969fd5555 100644
--- a/sql/updates/world/3.3.5/2016_11_27_03_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_27_03_world.sql
diff --git a/sql/updates/world/3.3.5/2016_11_27_04_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_27_04_world.sql
index ca76be83750..ca76be83750 100644
--- a/sql/updates/world/3.3.5/2016_11_27_04_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_27_04_world.sql
diff --git a/sql/updates/world/3.3.5/2016_11_29_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_29_00_world.sql
index 8487cca92f6..8487cca92f6 100644
--- a/sql/updates/world/3.3.5/2016_11_29_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_29_00_world.sql
diff --git a/sql/updates/world/3.3.5/2016_11_30_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_30_00_world.sql
index 7b88bb9641f..7b88bb9641f 100644
--- a/sql/updates/world/3.3.5/2016_11_30_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_30_00_world.sql
diff --git a/sql/updates/world/3.3.5/2016_11_30_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_30_01_world.sql
index 9dcf3c9f333..9dcf3c9f333 100644
--- a/sql/updates/world/3.3.5/2016_11_30_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_11_30_01_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_01_00_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_01_00_world_335.sql
index 5e3889a9f23..5e3889a9f23 100644
--- a/sql/updates/world/3.3.5/2016_12_01_00_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_01_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_12_01_01_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_01_01_world_335.sql
index daf23f3e540..daf23f3e540 100644
--- a/sql/updates/world/3.3.5/2016_12_01_01_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_01_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_12_01_02_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_01_02_world_335.sql
index e7b5d581ed4..e7b5d581ed4 100644
--- a/sql/updates/world/3.3.5/2016_12_01_02_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_01_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_12_06_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_06_00_world.sql
index 8669da350af..8669da350af 100644
--- a/sql/updates/world/3.3.5/2016_12_06_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_06_00_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_07_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_07_00_world.sql
index 9037c449f04..9037c449f04 100644
--- a/sql/updates/world/3.3.5/2016_12_07_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_07_00_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_07_01_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_07_01_world_335.sql
index 886140c80b3..886140c80b3 100644
--- a/sql/updates/world/3.3.5/2016_12_07_01_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_07_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_12_09_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_09_00_world.sql
index 2fe085852fe..2fe085852fe 100644
--- a/sql/updates/world/3.3.5/2016_12_09_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_09_00_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_09_01_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_09_01_world_335.sql
index 06d89bfb3dc..06d89bfb3dc 100644
--- a/sql/updates/world/3.3.5/2016_12_09_01_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_09_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_12_09_02_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_09_02_world_335.sql
index d35636ede10..d35636ede10 100644
--- a/sql/updates/world/3.3.5/2016_12_09_02_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_09_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_12_09_03_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_09_03_world_335.sql
index ef71ea7ddea..ef71ea7ddea 100644
--- a/sql/updates/world/3.3.5/2016_12_09_03_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_09_03_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_12_10_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_10_00_world.sql
index 625a141c21c..625a141c21c 100644
--- a/sql/updates/world/3.3.5/2016_12_10_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_10_00_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_10_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_10_01_world.sql
index c7a11f1d564..c7a11f1d564 100644
--- a/sql/updates/world/3.3.5/2016_12_10_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_10_01_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_13_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_13_00_world.sql
index 8f511dd0d2f..8f511dd0d2f 100644
--- a/sql/updates/world/3.3.5/2016_12_13_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_13_00_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_13_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_13_01_world.sql
index c0eab1464e7..c0eab1464e7 100644
--- a/sql/updates/world/3.3.5/2016_12_13_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_13_01_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_13_02_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_13_02_world.sql
index 5efa3fcbb43..5efa3fcbb43 100644
--- a/sql/updates/world/3.3.5/2016_12_13_02_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_13_02_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_13_03_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_13_03_world_335.sql
index 9c69116800a..9c69116800a 100644
--- a/sql/updates/world/3.3.5/2016_12_13_03_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_13_03_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_12_13_04_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_13_04_world_335.sql
index 698694bff43..698694bff43 100644
--- a/sql/updates/world/3.3.5/2016_12_13_04_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_13_04_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_12_13_05_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_13_05_world.sql
index 385d0a24778..385d0a24778 100644
--- a/sql/updates/world/3.3.5/2016_12_13_05_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_13_05_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_15_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_15_00_world.sql
index 5b749f075a3..5b749f075a3 100644
--- a/sql/updates/world/3.3.5/2016_12_15_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_15_00_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_15_01_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_15_01_world_335.sql
index 4f116eb1ef8..4f116eb1ef8 100644
--- a/sql/updates/world/3.3.5/2016_12_15_01_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_15_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_12_18_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_18_00_world.sql
index 3c521db2c2b..3c521db2c2b 100644
--- a/sql/updates/world/3.3.5/2016_12_18_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_18_00_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_20_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_20_00_world.sql
index 514169cb5c8..514169cb5c8 100644
--- a/sql/updates/world/3.3.5/2016_12_20_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_20_00_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_21_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_21_00_world.sql
index 06759ffd58b..06759ffd58b 100644
--- a/sql/updates/world/3.3.5/2016_12_21_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_21_00_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_22_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_22_00_world.sql
index 1530d2f5f8f..1530d2f5f8f 100644
--- a/sql/updates/world/3.3.5/2016_12_22_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_22_00_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_23_00_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_23_00_world_335.sql
index 4e91d0efc01..4e91d0efc01 100644
--- a/sql/updates/world/3.3.5/2016_12_23_00_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_23_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_12_23_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_23_01_world.sql
index 7840ea0260c..7840ea0260c 100644
--- a/sql/updates/world/3.3.5/2016_12_23_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_23_01_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_24_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_24_00_world.sql
index 403ee80fd86..403ee80fd86 100644
--- a/sql/updates/world/3.3.5/2016_12_24_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_24_00_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_24_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_24_01_world.sql
index ac15a23500d..ac15a23500d 100644
--- a/sql/updates/world/3.3.5/2016_12_24_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_24_01_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_24_02_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_24_02_world.sql
index a00928d96b3..a00928d96b3 100644
--- a/sql/updates/world/3.3.5/2016_12_24_02_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_24_02_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_24_03_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_24_03_world.sql
index 587770aebfb..587770aebfb 100644
--- a/sql/updates/world/3.3.5/2016_12_24_03_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_24_03_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_24_04_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_24_04_world_335.sql
index f52998ca536..f52998ca536 100644
--- a/sql/updates/world/3.3.5/2016_12_24_04_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_24_04_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_12_24_05_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_24_05_world.sql
index 862fd4562f1..862fd4562f1 100644
--- a/sql/updates/world/3.3.5/2016_12_24_05_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_24_05_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_24_06_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_24_06_world.sql
index dffec0b5b78..dffec0b5b78 100644
--- a/sql/updates/world/3.3.5/2016_12_24_06_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_24_06_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_24_07_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_24_07_world_335.sql
index 9955efd3554..9955efd3554 100644
--- a/sql/updates/world/3.3.5/2016_12_24_07_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_24_07_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_12_24_08_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_24_08_world_335.sql
index 4fc1d2014cc..4fc1d2014cc 100644
--- a/sql/updates/world/3.3.5/2016_12_24_08_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_24_08_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_12_24_09_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_24_09_world.sql
index 9a2222aeb1e..9a2222aeb1e 100644
--- a/sql/updates/world/3.3.5/2016_12_24_09_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_24_09_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_24_10_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_24_10_world.sql
index 4eff87396c9..4eff87396c9 100644
--- a/sql/updates/world/3.3.5/2016_12_24_10_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_24_10_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_25_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_25_00_world.sql
index 83b714e6fe7..83b714e6fe7 100644
--- a/sql/updates/world/3.3.5/2016_12_25_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_25_00_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_25_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_25_01_world.sql
index 4284f02f904..4284f02f904 100644
--- a/sql/updates/world/3.3.5/2016_12_25_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_25_01_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_25_02_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_25_02_world.sql
index 0d087b3942c..0d087b3942c 100644
--- a/sql/updates/world/3.3.5/2016_12_25_02_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_25_02_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_25_03_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_25_03_world.sql
index 6df16c4f4ae..6df16c4f4ae 100644
--- a/sql/updates/world/3.3.5/2016_12_25_03_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_25_03_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_25_04_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_25_04_world.sql
index 12564935151..12564935151 100644
--- a/sql/updates/world/3.3.5/2016_12_25_04_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_25_04_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_26_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_26_00_world.sql
index 2b4516de7c5..2b4516de7c5 100644
--- a/sql/updates/world/3.3.5/2016_12_26_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_26_00_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_26_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_26_01_world.sql
index e96f25c746c..e96f25c746c 100644
--- a/sql/updates/world/3.3.5/2016_12_26_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_26_01_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_26_02_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_26_02_world_335.sql
index a636157ddeb..a636157ddeb 100644
--- a/sql/updates/world/3.3.5/2016_12_26_02_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_26_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_12_26_03_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_26_03_world.sql
index 3031b9e776d..3031b9e776d 100644
--- a/sql/updates/world/3.3.5/2016_12_26_03_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_26_03_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_26_04_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_26_04_world.sql
index 931fc89b874..931fc89b874 100644
--- a/sql/updates/world/3.3.5/2016_12_26_04_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_26_04_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_26_05_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_26_05_world.sql
index 80728a21dab..80728a21dab 100644
--- a/sql/updates/world/3.3.5/2016_12_26_05_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_26_05_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_26_06_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_26_06_world.sql
index 7ad43549c84..7ad43549c84 100644
--- a/sql/updates/world/3.3.5/2016_12_26_06_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_26_06_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_26_07_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_26_07_world.sql
index 727ee3780f5..727ee3780f5 100644
--- a/sql/updates/world/3.3.5/2016_12_26_07_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_26_07_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_27_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_27_00_world.sql
index b5fa4248a9e..b5fa4248a9e 100644
--- a/sql/updates/world/3.3.5/2016_12_27_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_27_00_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_27_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_27_01_world.sql
index 9c0011b4796..9c0011b4796 100644
--- a/sql/updates/world/3.3.5/2016_12_27_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_27_01_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_27_02_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_27_02_world.sql
index 92b2d7e5f27..92b2d7e5f27 100644
--- a/sql/updates/world/3.3.5/2016_12_27_02_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_27_02_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_27_03_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_27_03_world.sql
index 85433749a1c..85433749a1c 100644
--- a/sql/updates/world/3.3.5/2016_12_27_03_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_27_03_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_27_04_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_27_04_world.sql
index c2102ee52ca..c2102ee52ca 100644
--- a/sql/updates/world/3.3.5/2016_12_27_04_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_27_04_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_27_05_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_27_05_world.sql
index 409712a16d1..409712a16d1 100644
--- a/sql/updates/world/3.3.5/2016_12_27_05_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_27_05_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_27_06_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_27_06_world.sql
index 3efb3910e98..3efb3910e98 100644
--- a/sql/updates/world/3.3.5/2016_12_27_06_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_27_06_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_27_07_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_27_07_world.sql
index 1ce1f55d68b..1ce1f55d68b 100644
--- a/sql/updates/world/3.3.5/2016_12_27_07_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_27_07_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_27_08_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_27_08_world.sql
index d880657f855..d880657f855 100644
--- a/sql/updates/world/3.3.5/2016_12_27_08_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_27_08_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_27_09_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_27_09_world.sql
index 41c3da1358a..41c3da1358a 100644
--- a/sql/updates/world/3.3.5/2016_12_27_09_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_27_09_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_27_10_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_27_10_world.sql
index 714724a3962..714724a3962 100644
--- a/sql/updates/world/3.3.5/2016_12_27_10_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_27_10_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_28_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_28_00_world.sql
index 6f0220691c2..6f0220691c2 100644
--- a/sql/updates/world/3.3.5/2016_12_28_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_28_00_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_28_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_28_01_world.sql
index 6541122e197..6541122e197 100644
--- a/sql/updates/world/3.3.5/2016_12_28_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_28_01_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_28_02_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_28_02_world_335.sql
index c558424dd08..c558424dd08 100644
--- a/sql/updates/world/3.3.5/2016_12_28_02_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_28_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_12_28_03_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_28_03_world.sql
index d8ed1fd2f11..d8ed1fd2f11 100644
--- a/sql/updates/world/3.3.5/2016_12_28_03_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_28_03_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_28_04_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_28_04_world.sql
index 653309b0b24..653309b0b24 100644
--- a/sql/updates/world/3.3.5/2016_12_28_04_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_28_04_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_28_05_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_28_05_world.sql
index 860e906224c..860e906224c 100644
--- a/sql/updates/world/3.3.5/2016_12_28_05_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_28_05_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_28_06_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_28_06_world.sql
index 948093d799d..948093d799d 100644
--- a/sql/updates/world/3.3.5/2016_12_28_06_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_28_06_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_28_07_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_28_07_world.sql
index a68461dc8da..a68461dc8da 100644
--- a/sql/updates/world/3.3.5/2016_12_28_07_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_28_07_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_28_08_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_28_08_world.sql
index df0c57dfeb9..df0c57dfeb9 100644
--- a/sql/updates/world/3.3.5/2016_12_28_08_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_28_08_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_28_09_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_28_09_world.sql
index 35299df7d78..35299df7d78 100644
--- a/sql/updates/world/3.3.5/2016_12_28_09_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_28_09_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_28_10_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_28_10_world.sql
index d3518269e1a..d3518269e1a 100644
--- a/sql/updates/world/3.3.5/2016_12_28_10_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_28_10_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_28_11_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_28_11_world_335.sql
index b588f5c5db9..b588f5c5db9 100644
--- a/sql/updates/world/3.3.5/2016_12_28_11_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_28_11_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_12_28_12_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_28_12_world.sql
index 11acdd04fcf..11acdd04fcf 100644
--- a/sql/updates/world/3.3.5/2016_12_28_12_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_28_12_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_29_00_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_29_00_world_335.sql
index 563f5470a14..563f5470a14 100644
--- a/sql/updates/world/3.3.5/2016_12_29_00_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_29_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_12_29_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_29_01_world.sql
index 57da40d7cbd..57da40d7cbd 100644
--- a/sql/updates/world/3.3.5/2016_12_29_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_29_01_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_29_02_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_29_02_world.sql
index 0805212d0df..0805212d0df 100644
--- a/sql/updates/world/3.3.5/2016_12_29_02_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_29_02_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_29_03_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_29_03_world_335.sql
index 00d9cecd7b9..00d9cecd7b9 100644
--- a/sql/updates/world/3.3.5/2016_12_29_03_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_29_03_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_12_29_04_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_29_04_world.sql
index 42f2ee0020a..42f2ee0020a 100644
--- a/sql/updates/world/3.3.5/2016_12_29_04_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_29_04_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_29_05_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_29_05_world_335.sql
index c2232322f1d..c2232322f1d 100644
--- a/sql/updates/world/3.3.5/2016_12_29_05_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_29_05_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_12_29_06_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_29_06_world.sql
index 2a4bf3e3174..2a4bf3e3174 100644
--- a/sql/updates/world/3.3.5/2016_12_29_06_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_29_06_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_29_07_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_29_07_world_335.sql
index 401eef4aee2..401eef4aee2 100644
--- a/sql/updates/world/3.3.5/2016_12_29_07_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_29_07_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_12_29_08_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_29_08_world.sql
index cf9bbedaddb..cf9bbedaddb 100644
--- a/sql/updates/world/3.3.5/2016_12_29_08_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_29_08_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_30_00_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_00_world_335.sql
index 8fb35ad279f..8fb35ad279f 100644
--- a/sql/updates/world/3.3.5/2016_12_30_00_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_12_30_01_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_01_world_335.sql
index f04c36e16e0..f04c36e16e0 100644
--- a/sql/updates/world/3.3.5/2016_12_30_01_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_12_30_02_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_02_world_335.sql
index 23954b3bee3..23954b3bee3 100644
--- a/sql/updates/world/3.3.5/2016_12_30_02_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_12_30_03_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_03_world.sql
index 329dcbc2408..329dcbc2408 100644
--- a/sql/updates/world/3.3.5/2016_12_30_03_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_03_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_30_04_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_04_world_335.sql
index e24faf7e615..e24faf7e615 100644
--- a/sql/updates/world/3.3.5/2016_12_30_04_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_04_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_12_30_05_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_05_world.sql
index 13ec86a2e7c..13ec86a2e7c 100644
--- a/sql/updates/world/3.3.5/2016_12_30_05_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_05_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_30_06_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_06_world.sql
index 7d8d7c3d648..7d8d7c3d648 100644
--- a/sql/updates/world/3.3.5/2016_12_30_06_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_06_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_30_07_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_07_world.sql
index 9f278578e5c..9f278578e5c 100644
--- a/sql/updates/world/3.3.5/2016_12_30_07_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_07_world.sql
diff --git a/sql/updates/world/3.3.5/2016_12_30_08_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_08_world_335.sql
index d3cc87162b0..d3cc87162b0 100644
--- a/sql/updates/world/3.3.5/2016_12_30_08_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_08_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_12_30_09_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_09_world_335.sql
index 6a0522fbd85..6a0522fbd85 100644
--- a/sql/updates/world/3.3.5/2016_12_30_09_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_09_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_12_30_10_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_10_world_335.sql
index 5d685d05755..5d685d05755 100644
--- a/sql/updates/world/3.3.5/2016_12_30_10_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_10_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_12_30_11_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_11_world_335.sql
index 22b4a91e239..22b4a91e239 100644
--- a/sql/updates/world/3.3.5/2016_12_30_11_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_11_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_12_30_12_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_12_world_335.sql
index df0c294234c..df0c294234c 100644
--- a/sql/updates/world/3.3.5/2016_12_30_12_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_12_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_12_30_13_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_13_world_335.sql
index 5f2f38b3c0b..5f2f38b3c0b 100644
--- a/sql/updates/world/3.3.5/2016_12_30_13_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_13_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_12_30_14_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_14_world_335.sql
index 446e8e282a4..446e8e282a4 100644
--- a/sql/updates/world/3.3.5/2016_12_30_14_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_14_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_12_30_15_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_15_world_335.sql
index cbbea2acf21..cbbea2acf21 100644
--- a/sql/updates/world/3.3.5/2016_12_30_15_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_15_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_12_30_16_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_16_world_335.sql
index 381ded0d614..381ded0d614 100644
--- a/sql/updates/world/3.3.5/2016_12_30_16_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_16_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_12_30_17_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_17_world_335.sql
index ca11c4d316c..ca11c4d316c 100644
--- a/sql/updates/world/3.3.5/2016_12_30_17_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_17_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_12_30_18_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_18_world_335.sql
index b68ad837104..b68ad837104 100644
--- a/sql/updates/world/3.3.5/2016_12_30_18_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_18_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_12_30_19_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_19_world_335.sql
index 6e4c8fa4cb7..6e4c8fa4cb7 100644
--- a/sql/updates/world/3.3.5/2016_12_30_19_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_19_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_12_30_20_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_20_world_335.sql
index 8eef59b6ecd..8eef59b6ecd 100644
--- a/sql/updates/world/3.3.5/2016_12_30_20_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_20_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_12_30_21_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_21_world_335.sql
index 384aaf3184f..384aaf3184f 100644
--- a/sql/updates/world/3.3.5/2016_12_30_21_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_21_world_335.sql
diff --git a/sql/updates/world/3.3.5/2016_12_30_22_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_22_world.sql
index 8ce8969d980..8ce8969d980 100644
--- a/sql/updates/world/3.3.5/2016_12_30_22_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2016_12_30_22_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_01_00_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_01_00_world_335.sql
index 32b1de7bb7d..32b1de7bb7d 100644
--- a/sql/updates/world/3.3.5/2017_01_01_00_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_01_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_01_01_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_01_01_world_335.sql
index fafb7fad57c..fafb7fad57c 100644
--- a/sql/updates/world/3.3.5/2017_01_01_01_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_01_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_01_02_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_01_02_world.sql
index 537a87723af..537a87723af 100644
--- a/sql/updates/world/3.3.5/2017_01_01_02_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_01_02_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_01_03_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_01_03_world.sql
index a088917b3a3..a088917b3a3 100644
--- a/sql/updates/world/3.3.5/2017_01_01_03_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_01_03_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_01_04_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_01_04_world.sql
index 722f9989e41..722f9989e41 100644
--- a/sql/updates/world/3.3.5/2017_01_01_04_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_01_04_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_01_05_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_01_05_world_335.sql
index ac872d76c63..ac872d76c63 100644
--- a/sql/updates/world/3.3.5/2017_01_01_05_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_01_05_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_01_06_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_01_06_world.sql
index 4c8df8c0d9d..4c8df8c0d9d 100644
--- a/sql/updates/world/3.3.5/2017_01_01_06_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_01_06_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_01_07_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_01_07_world.sql
index 3395b580746..3395b580746 100644
--- a/sql/updates/world/3.3.5/2017_01_01_07_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_01_07_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_02_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_02_00_world.sql
index 1b2b2bf89d6..1b2b2bf89d6 100644
--- a/sql/updates/world/3.3.5/2017_01_02_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_02_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_02_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_02_01_world.sql
index 13f0b114414..13f0b114414 100644
--- a/sql/updates/world/3.3.5/2017_01_02_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_02_01_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_02_02_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_02_02_world.sql
index 46b06f1f3eb..46b06f1f3eb 100644
--- a/sql/updates/world/3.3.5/2017_01_02_02_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_02_02_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_02_03_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_02_03_world.sql
index 5e18bcc334c..5e18bcc334c 100644
--- a/sql/updates/world/3.3.5/2017_01_02_03_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_02_03_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_02_04_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_02_04_world.sql
index 40238ad9c4b..40238ad9c4b 100644
--- a/sql/updates/world/3.3.5/2017_01_02_04_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_02_04_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_02_05_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_02_05_world_335.sql
index 18d952eebbc..18d952eebbc 100644
--- a/sql/updates/world/3.3.5/2017_01_02_05_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_02_05_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_02_06_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_02_06_world.sql
index 639855e61e7..639855e61e7 100644
--- a/sql/updates/world/3.3.5/2017_01_02_06_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_02_06_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_02_07_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_02_07_world.sql
index 7d00cf6cca4..7d00cf6cca4 100644
--- a/sql/updates/world/3.3.5/2017_01_02_07_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_02_07_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_02_08_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_02_08_world.sql
index 67d31f75c8f..67d31f75c8f 100644
--- a/sql/updates/world/3.3.5/2017_01_02_08_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_02_08_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_02_09_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_02_09_world.sql
index 9abbce93555..9abbce93555 100644
--- a/sql/updates/world/3.3.5/2017_01_02_09_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_02_09_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_03_00_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_03_00_world_335.sql
index e9b89443c63..e9b89443c63 100644
--- a/sql/updates/world/3.3.5/2017_01_03_00_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_03_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_03_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_03_01_world.sql
index 51c907c1d1e..51c907c1d1e 100644
--- a/sql/updates/world/3.3.5/2017_01_03_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_03_01_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_04_00_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_04_00_world_335.sql
index 312d6e377df..312d6e377df 100644
--- a/sql/updates/world/3.3.5/2017_01_04_00_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_04_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_04_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_04_01_world.sql
index c93b22d45dc..c93b22d45dc 100644
--- a/sql/updates/world/3.3.5/2017_01_04_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_04_01_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_04_02_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_04_02_world_335.sql
index e0c9484fa0b..e0c9484fa0b 100644
--- a/sql/updates/world/3.3.5/2017_01_04_02_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_04_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_04_03_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_04_03_world_335.sql
index ddf4dfa0b1c..ddf4dfa0b1c 100644
--- a/sql/updates/world/3.3.5/2017_01_04_03_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_04_03_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_05_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_05_00_world.sql
index 30f0d9bd5b8..30f0d9bd5b8 100644
--- a/sql/updates/world/3.3.5/2017_01_05_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_05_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_05_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_05_01_world.sql
index 1e5da826fc1..1e5da826fc1 100644
--- a/sql/updates/world/3.3.5/2017_01_05_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_05_01_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_05_02_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_05_02_world.sql
index 911e4ec5589..911e4ec5589 100644
--- a/sql/updates/world/3.3.5/2017_01_05_02_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_05_02_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_05_03_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_05_03_world.sql
index ac3a958e904..ac3a958e904 100644
--- a/sql/updates/world/3.3.5/2017_01_05_03_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_05_03_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_06_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_06_00_world.sql
index 61a7c137261..61a7c137261 100644
--- a/sql/updates/world/3.3.5/2017_01_06_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_06_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_06_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_06_01_world.sql
index 6eaa17f8732..6eaa17f8732 100644
--- a/sql/updates/world/3.3.5/2017_01_06_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_06_01_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_07_00_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_07_00_world_335.sql
index 377f0ff57cf..377f0ff57cf 100644
--- a/sql/updates/world/3.3.5/2017_01_07_00_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_07_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_07_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_07_01_world.sql
index aab0fa7d962..aab0fa7d962 100644
--- a/sql/updates/world/3.3.5/2017_01_07_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_07_01_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_07_02_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_07_02_world_335.sql
index 1621067a559..1621067a559 100644
--- a/sql/updates/world/3.3.5/2017_01_07_02_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_07_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_07_03_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_07_03_world_335.sql
index ac9d66a98b3..ac9d66a98b3 100644
--- a/sql/updates/world/3.3.5/2017_01_07_03_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_07_03_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_08_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_08_00_world.sql
index be158a43ca4..be158a43ca4 100644
--- a/sql/updates/world/3.3.5/2017_01_08_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_08_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_08_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_08_01_world.sql
index 79efce1ed17..79efce1ed17 100644
--- a/sql/updates/world/3.3.5/2017_01_08_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_08_01_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_08_02_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_08_02_world.sql
index 42a05c0a888..42a05c0a888 100644
--- a/sql/updates/world/3.3.5/2017_01_08_02_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_08_02_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_08_03_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_08_03_world.sql
index 25752409668..25752409668 100644
--- a/sql/updates/world/3.3.5/2017_01_08_03_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_08_03_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_08_04_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_08_04_world.sql
index 947c62ee209..947c62ee209 100644
--- a/sql/updates/world/3.3.5/2017_01_08_04_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_08_04_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_08_05_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_08_05_world.sql
index 6cc8b876469..6cc8b876469 100644
--- a/sql/updates/world/3.3.5/2017_01_08_05_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_08_05_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_08_06_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_08_06_world_335.sql
index 13b20229563..13b20229563 100644
--- a/sql/updates/world/3.3.5/2017_01_08_06_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_08_06_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_08_07_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_08_07_world.sql
index b68428e19d4..b68428e19d4 100644
--- a/sql/updates/world/3.3.5/2017_01_08_07_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_08_07_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_09_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_09_00_world.sql
index f0df5c4ed39..f0df5c4ed39 100644
--- a/sql/updates/world/3.3.5/2017_01_09_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_09_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_09_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_09_01_world.sql
index d08dbd8d75e..d08dbd8d75e 100644
--- a/sql/updates/world/3.3.5/2017_01_09_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_09_01_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_09_02_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_09_02_world_335.sql
index 96df2222a05..96df2222a05 100644
--- a/sql/updates/world/3.3.5/2017_01_09_02_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_09_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_09_03_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_09_03_world_335.sql
index 9de3457708f..9de3457708f 100644
--- a/sql/updates/world/3.3.5/2017_01_09_03_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_09_03_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_09_04_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_09_04_world_335.sql
index 9e881aa4e45..9e881aa4e45 100644
--- a/sql/updates/world/3.3.5/2017_01_09_04_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_09_04_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_09_05_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_09_05_world_335.sql
index 8b9cc0545c0..8b9cc0545c0 100644
--- a/sql/updates/world/3.3.5/2017_01_09_05_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_09_05_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_09_06_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_09_06_world_335.sql
index 6ef7c2c548a..6ef7c2c548a 100644
--- a/sql/updates/world/3.3.5/2017_01_09_06_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_09_06_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_09_07_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_09_07_world_335.sql
index eeffaf4af79..eeffaf4af79 100644
--- a/sql/updates/world/3.3.5/2017_01_09_07_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_09_07_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_09_08_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_09_08_world.sql
index d2f367df5f0..d2f367df5f0 100644
--- a/sql/updates/world/3.3.5/2017_01_09_08_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_09_08_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_09_09_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_09_09_world.sql
index cc873c9d782..cc873c9d782 100644
--- a/sql/updates/world/3.3.5/2017_01_09_09_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_09_09_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_09_10_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_09_10_world_335.sql
index 2d693a213f6..2d693a213f6 100644
--- a/sql/updates/world/3.3.5/2017_01_09_10_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_09_10_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_11_00_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_11_00_world_335.sql
index 27618fd6e46..27618fd6e46 100644
--- a/sql/updates/world/3.3.5/2017_01_11_00_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_11_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_11_01_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_11_01_world_335.sql
index 722f6aa8618..722f6aa8618 100644
--- a/sql/updates/world/3.3.5/2017_01_11_01_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_11_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_11_02_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_11_02_world_335.sql
index 49d39e8ec01..49d39e8ec01 100644
--- a/sql/updates/world/3.3.5/2017_01_11_02_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_11_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_11_03_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_11_03_world.sql
index d0646af9786..d0646af9786 100644
--- a/sql/updates/world/3.3.5/2017_01_11_03_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_11_03_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_11_04_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_11_04_world.sql
index db93f3ed51a..db93f3ed51a 100644
--- a/sql/updates/world/3.3.5/2017_01_11_04_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_11_04_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_11_05_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_11_05_world.sql
index 40ae8ca6c4d..40ae8ca6c4d 100644
--- a/sql/updates/world/3.3.5/2017_01_11_05_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_11_05_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_11_06_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_11_06_world.sql
index 9ce89f473e8..9ce89f473e8 100644
--- a/sql/updates/world/3.3.5/2017_01_11_06_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_11_06_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_11_07_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_11_07_world.sql
index 7527cae1cc6..7527cae1cc6 100644
--- a/sql/updates/world/3.3.5/2017_01_11_07_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_11_07_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_11_08_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_11_08_world_335.sql
index abebf02e372..abebf02e372 100644
--- a/sql/updates/world/3.3.5/2017_01_11_08_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_11_08_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_11_09_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_11_09_world.sql
index 987060b6ad9..987060b6ad9 100644
--- a/sql/updates/world/3.3.5/2017_01_11_09_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_11_09_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_11_10_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_11_10_world_335.sql
index ad959be7b11..ad959be7b11 100644
--- a/sql/updates/world/3.3.5/2017_01_11_10_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_11_10_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_11_11_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_11_11_world.sql
index 51fe89634f1..51fe89634f1 100644
--- a/sql/updates/world/3.3.5/2017_01_11_11_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_11_11_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_11_12_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_11_12_world.sql
index 563ed770df9..563ed770df9 100644
--- a/sql/updates/world/3.3.5/2017_01_11_12_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_11_12_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_11_13_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_11_13_world.sql
index 6a07a3210f3..6a07a3210f3 100644
--- a/sql/updates/world/3.3.5/2017_01_11_13_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_11_13_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_11_14_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_11_14_world.sql
index 98ef7e7783e..98ef7e7783e 100644
--- a/sql/updates/world/3.3.5/2017_01_11_14_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_11_14_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_11_15_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_11_15_world.sql
index 7b386b14d21..7b386b14d21 100644
--- a/sql/updates/world/3.3.5/2017_01_11_15_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_11_15_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_11_16_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_11_16_world.sql
index b2a048a3eaa..b2a048a3eaa 100644
--- a/sql/updates/world/3.3.5/2017_01_11_16_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_11_16_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_13_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_13_00_world.sql
index a410c63bbe2..a410c63bbe2 100644
--- a/sql/updates/world/3.3.5/2017_01_13_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_13_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_13_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_13_01_world.sql
index f912479e32f..f912479e32f 100644
--- a/sql/updates/world/3.3.5/2017_01_13_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_13_01_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_13_02_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_13_02_world.sql
index ae761bd3020..ae761bd3020 100644
--- a/sql/updates/world/3.3.5/2017_01_13_02_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_13_02_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_13_03_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_13_03_world.sql
index 546b1ff336e..546b1ff336e 100644
--- a/sql/updates/world/3.3.5/2017_01_13_03_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_13_03_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_13_04_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_13_04_world_335.sql
index f8b15049811..f8b15049811 100644
--- a/sql/updates/world/3.3.5/2017_01_13_04_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_13_04_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_13_05_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_13_05_world_335.sql
index 2171d496147..2171d496147 100644
--- a/sql/updates/world/3.3.5/2017_01_13_05_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_13_05_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_13_06_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_13_06_world.sql
index 91af2a4ca48..91af2a4ca48 100644
--- a/sql/updates/world/3.3.5/2017_01_13_06_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_13_06_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_13_07_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_13_07_world.sql
index e679743e5f0..e679743e5f0 100644
--- a/sql/updates/world/3.3.5/2017_01_13_07_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_13_07_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_14_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_14_00_world.sql
index 8a0dd27d3d8..8a0dd27d3d8 100644
--- a/sql/updates/world/3.3.5/2017_01_14_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_14_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_14_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_14_01_world.sql
index d7826872ec8..d7826872ec8 100644
--- a/sql/updates/world/3.3.5/2017_01_14_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_14_01_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_14_02_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_14_02_world.sql
index 801e2150779..801e2150779 100644
--- a/sql/updates/world/3.3.5/2017_01_14_02_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_14_02_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_14_03_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_14_03_world.sql
index 1fafcab980a..1fafcab980a 100644
--- a/sql/updates/world/3.3.5/2017_01_14_03_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_14_03_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_14_04_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_14_04_world.sql
index d8bb51cd93f..d8bb51cd93f 100644
--- a/sql/updates/world/3.3.5/2017_01_14_04_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_14_04_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_14_05_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_14_05_world_335.sql
index c8f5f0a60d6..c8f5f0a60d6 100644
--- a/sql/updates/world/3.3.5/2017_01_14_05_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_14_05_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_14_06_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_14_06_world.sql
index 40f1171dd26..40f1171dd26 100644
--- a/sql/updates/world/3.3.5/2017_01_14_06_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_14_06_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_14_07_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_14_07_world.sql
index 3dccb2baf69..3dccb2baf69 100644
--- a/sql/updates/world/3.3.5/2017_01_14_07_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_14_07_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_15_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_15_00_world.sql
index ba64ef15ebc..ba64ef15ebc 100644
--- a/sql/updates/world/3.3.5/2017_01_15_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_15_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_15_01_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_15_01_world_335.sql
index e8bf33c0dda..e8bf33c0dda 100644
--- a/sql/updates/world/3.3.5/2017_01_15_01_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_15_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_15_02_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_15_02_world.sql
index 0a2e3a24e9b..0a2e3a24e9b 100644
--- a/sql/updates/world/3.3.5/2017_01_15_02_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_15_02_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_15_03_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_15_03_world.sql
index 23be138330c..23be138330c 100644
--- a/sql/updates/world/3.3.5/2017_01_15_03_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_15_03_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_15_04_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_15_04_world.sql
index d49229169ff..d49229169ff 100644
--- a/sql/updates/world/3.3.5/2017_01_15_04_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_15_04_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_15_05_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_15_05_world.sql
index bc70c999626..bc70c999626 100644
--- a/sql/updates/world/3.3.5/2017_01_15_05_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_15_05_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_15_06_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_15_06_world.sql
index 8e462c4fe95..8e462c4fe95 100644
--- a/sql/updates/world/3.3.5/2017_01_15_06_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_15_06_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_15_07_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_15_07_world.sql
index 0d688f4ac08..0d688f4ac08 100644
--- a/sql/updates/world/3.3.5/2017_01_15_07_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_15_07_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_15_08_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_15_08_world.sql
index 42ec9f7b273..42ec9f7b273 100644
--- a/sql/updates/world/3.3.5/2017_01_15_08_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_15_08_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_15_09_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_15_09_world.sql
index e50d903be51..e50d903be51 100644
--- a/sql/updates/world/3.3.5/2017_01_15_09_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_15_09_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_15_10_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_15_10_world.sql
index 503d915c8c6..503d915c8c6 100644
--- a/sql/updates/world/3.3.5/2017_01_15_10_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_15_10_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_16_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_16_00_world.sql
index 933e8a14b59..933e8a14b59 100644
--- a/sql/updates/world/3.3.5/2017_01_16_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_16_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_16_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_16_01_world.sql
index 4f5d31b9e73..4f5d31b9e73 100644
--- a/sql/updates/world/3.3.5/2017_01_16_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_16_01_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_16_02_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_16_02_world.sql
index c3a62ab61b6..c3a62ab61b6 100644
--- a/sql/updates/world/3.3.5/2017_01_16_02_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_16_02_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_16_03_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_16_03_world.sql
index 459a6a5fe6f..459a6a5fe6f 100644
--- a/sql/updates/world/3.3.5/2017_01_16_03_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_16_03_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_16_04_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_16_04_world.sql
index 332771cbf76..332771cbf76 100644
--- a/sql/updates/world/3.3.5/2017_01_16_04_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_16_04_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_16_05_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_16_05_world.sql
index b4351d0c775..b4351d0c775 100644
--- a/sql/updates/world/3.3.5/2017_01_16_05_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_16_05_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_16_06_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_16_06_world.sql
index 2939d02bed6..2939d02bed6 100644
--- a/sql/updates/world/3.3.5/2017_01_16_06_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_16_06_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_17_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_17_00_world.sql
index 278006be829..278006be829 100644
--- a/sql/updates/world/3.3.5/2017_01_17_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_17_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_19_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_19_00_world.sql
index 2cb29a6f708..2cb29a6f708 100644
--- a/sql/updates/world/3.3.5/2017_01_19_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_19_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_20_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_20_00_world.sql
index d6a0a578590..d6a0a578590 100644
--- a/sql/updates/world/3.3.5/2017_01_20_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_20_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_20_01_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_20_01_world_335.sql
index 4e70836126a..4e70836126a 100644
--- a/sql/updates/world/3.3.5/2017_01_20_01_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_20_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_20_02_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_20_02_world.sql
index 393e1102b7e..393e1102b7e 100644
--- a/sql/updates/world/3.3.5/2017_01_20_02_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_20_02_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_20_03_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_20_03_world.sql
index 7f011468acb..7f011468acb 100644
--- a/sql/updates/world/3.3.5/2017_01_20_03_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_20_03_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_20_04_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_20_04_world.sql
index 0ab38aa7eec..0ab38aa7eec 100644
--- a/sql/updates/world/3.3.5/2017_01_20_04_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_20_04_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_20_05_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_20_05_world.sql
index 1cc32d93542..1cc32d93542 100644
--- a/sql/updates/world/3.3.5/2017_01_20_05_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_20_05_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_20_06_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_20_06_world_335.sql
index 877043a867e..877043a867e 100644
--- a/sql/updates/world/3.3.5/2017_01_20_06_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_20_06_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_20_07_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_20_07_world_335.sql
index af73d2595be..af73d2595be 100644
--- a/sql/updates/world/3.3.5/2017_01_20_07_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_20_07_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_21_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_21_00_world.sql
index 8e85edf00e3..8e85edf00e3 100644
--- a/sql/updates/world/3.3.5/2017_01_21_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_21_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_22_00_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_22_00_world_335.sql
index d447767ae74..d447767ae74 100644
--- a/sql/updates/world/3.3.5/2017_01_22_00_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_22_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_22_01_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_22_01_world_335.sql
index 850842436c3..850842436c3 100644
--- a/sql/updates/world/3.3.5/2017_01_22_01_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_22_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_22_02_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_22_02_world_335.sql
index d64f75ebbad..d64f75ebbad 100644
--- a/sql/updates/world/3.3.5/2017_01_22_02_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_22_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_22_03_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_22_03_world.sql
index dcd17547408..dcd17547408 100644
--- a/sql/updates/world/3.3.5/2017_01_22_03_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_22_03_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_22_04_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_22_04_world.sql
index 6974c5e4bf2..6974c5e4bf2 100644
--- a/sql/updates/world/3.3.5/2017_01_22_04_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_22_04_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_22_05_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_22_05_world_335.sql
index 7e3912d5445..7e3912d5445 100644
--- a/sql/updates/world/3.3.5/2017_01_22_05_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_22_05_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_22_06_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_22_06_world_335.sql
index a16172cdd4e..a16172cdd4e 100644
--- a/sql/updates/world/3.3.5/2017_01_22_06_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_22_06_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_22_07_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_22_07_world.sql
index bf0072004e7..bf0072004e7 100644
--- a/sql/updates/world/3.3.5/2017_01_22_07_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_22_07_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_22_08_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_22_08_world.sql
index 28300eca6f7..28300eca6f7 100644
--- a/sql/updates/world/3.3.5/2017_01_22_08_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_22_08_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_22_09_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_22_09_world.sql
index a9269b15869..a9269b15869 100644
--- a/sql/updates/world/3.3.5/2017_01_22_09_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_22_09_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_22_10_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_22_10_world_335.sql
index c994dfcf316..c994dfcf316 100644
--- a/sql/updates/world/3.3.5/2017_01_22_10_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_22_10_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_22_11_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_22_11_world_335.sql
index 85550094402..85550094402 100644
--- a/sql/updates/world/3.3.5/2017_01_22_11_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_22_11_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_22_12_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_22_12_world.sql
index dee365a7ea2..dee365a7ea2 100644
--- a/sql/updates/world/3.3.5/2017_01_22_12_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_22_12_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_23_00_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_23_00_world_335.sql
index e4cc79736d2..e4cc79736d2 100644
--- a/sql/updates/world/3.3.5/2017_01_23_00_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_23_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_23_01_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_23_01_world_335.sql
index 0395ad0a73c..0395ad0a73c 100644
--- a/sql/updates/world/3.3.5/2017_01_23_01_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_23_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_23_02_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_23_02_world_335.sql
index e26f76152dc..e26f76152dc 100644
--- a/sql/updates/world/3.3.5/2017_01_23_02_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_23_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_23_03_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_23_03_world.sql
index 32eac33787a..32eac33787a 100644
--- a/sql/updates/world/3.3.5/2017_01_23_03_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_23_03_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_24_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_24_00_world.sql
index 6379b58140c..6379b58140c 100644
--- a/sql/updates/world/3.3.5/2017_01_24_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_24_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_24_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_24_01_world.sql
index 9d39ae9d9c4..9d39ae9d9c4 100644
--- a/sql/updates/world/3.3.5/2017_01_24_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_24_01_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_24_02_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_24_02_world.sql
index c741f1b025c..c741f1b025c 100644
--- a/sql/updates/world/3.3.5/2017_01_24_02_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_24_02_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_24_03_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_24_03_world.sql
index 4d4a222c07f..4d4a222c07f 100644
--- a/sql/updates/world/3.3.5/2017_01_24_03_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_24_03_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_24_04_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_24_04_world.sql
index 48eb8f9c401..48eb8f9c401 100644
--- a/sql/updates/world/3.3.5/2017_01_24_04_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_24_04_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_24_05_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_24_05_world.sql
index eaa9b71b228..eaa9b71b228 100644
--- a/sql/updates/world/3.3.5/2017_01_24_05_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_24_05_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_24_06_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_24_06_world.sql
index c13572e7db1..c13572e7db1 100644
--- a/sql/updates/world/3.3.5/2017_01_24_06_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_24_06_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_24_07_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_24_07_world.sql
index df9e05244ea..df9e05244ea 100644
--- a/sql/updates/world/3.3.5/2017_01_24_07_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_24_07_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_24_08_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_24_08_world.sql
index b42ed619271..b42ed619271 100644
--- a/sql/updates/world/3.3.5/2017_01_24_08_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_24_08_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_25_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_25_00_world.sql
index 19ba749a09d..19ba749a09d 100644
--- a/sql/updates/world/3.3.5/2017_01_25_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_25_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_25_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_25_01_world.sql
index 7af38f38e91..7af38f38e91 100644
--- a/sql/updates/world/3.3.5/2017_01_25_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_25_01_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_26_00_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_26_00_world_335.sql
index 38119c373dc..38119c373dc 100644
--- a/sql/updates/world/3.3.5/2017_01_26_00_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_26_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_01_26_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_26_01_world.sql
index 75a8a2eaaa2..75a8a2eaaa2 100644
--- a/sql/updates/world/3.3.5/2017_01_26_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_26_01_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_26_02_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_26_02_world.sql
index acffb0652dc..acffb0652dc 100644
--- a/sql/updates/world/3.3.5/2017_01_26_02_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_26_02_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_26_03_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_26_03_world.sql
index ba0bf02a99e..ba0bf02a99e 100644
--- a/sql/updates/world/3.3.5/2017_01_26_03_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_26_03_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_26_04_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_26_04_world.sql
index 20e1a6f75a0..20e1a6f75a0 100644
--- a/sql/updates/world/3.3.5/2017_01_26_04_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_26_04_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_26_05_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_26_05_world.sql
index ad73d0794d7..ad73d0794d7 100644
--- a/sql/updates/world/3.3.5/2017_01_26_05_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_26_05_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_26_06_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_26_06_world.sql
index 79bb6b4ce67..79bb6b4ce67 100644
--- a/sql/updates/world/3.3.5/2017_01_26_06_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_26_06_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_26_07_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_26_07_world.sql
index 2d564bdd8e2..2d564bdd8e2 100644
--- a/sql/updates/world/3.3.5/2017_01_26_07_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_26_07_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_26_08_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_26_08_world.sql
index 4231337a1e0..4231337a1e0 100644
--- a/sql/updates/world/3.3.5/2017_01_26_08_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_26_08_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_26_09_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_26_09_world.sql
index 307f57d3d03..307f57d3d03 100644
--- a/sql/updates/world/3.3.5/2017_01_26_09_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_26_09_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_26_10_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_26_10_world.sql
index 93bc3f9febc..93bc3f9febc 100644
--- a/sql/updates/world/3.3.5/2017_01_26_10_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_26_10_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_26_11_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_26_11_world.sql
index 0081aa1f420..0081aa1f420 100644
--- a/sql/updates/world/3.3.5/2017_01_26_11_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_26_11_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_26_12_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_26_12_world.sql
index 457d994aad3..457d994aad3 100644
--- a/sql/updates/world/3.3.5/2017_01_26_12_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_26_12_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_26_13_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_26_13_world.sql
index 8748303c1d5..8748303c1d5 100644
--- a/sql/updates/world/3.3.5/2017_01_26_13_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_26_13_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_29_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_29_00_world.sql
index da8f4665661..da8f4665661 100644
--- a/sql/updates/world/3.3.5/2017_01_29_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_29_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_30_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_30_00_world.sql
index 5cddcc82336..5cddcc82336 100644
--- a/sql/updates/world/3.3.5/2017_01_30_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_30_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_01_30_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_30_01_world.sql
index 36c690947bd..36c690947bd 100644
--- a/sql/updates/world/3.3.5/2017_01_30_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_01_30_01_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_04_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_04_00_world.sql
index 14510bc094f..14510bc094f 100644
--- a/sql/updates/world/3.3.5/2017_02_04_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_04_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_04_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_04_01_world.sql
index d9d538950a6..d9d538950a6 100644
--- a/sql/updates/world/3.3.5/2017_02_04_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_04_01_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_04_02_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_04_02_world.sql
index 6a88b484897..6a88b484897 100644
--- a/sql/updates/world/3.3.5/2017_02_04_02_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_04_02_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_04_03_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_04_03_world.sql
index 8666746a41c..8666746a41c 100644
--- a/sql/updates/world/3.3.5/2017_02_04_03_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_04_03_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_04_04_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_04_04_world.sql
index d5711439034..d5711439034 100644
--- a/sql/updates/world/3.3.5/2017_02_04_04_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_04_04_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_04_05_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_04_05_world.sql
index cb7860360e6..cb7860360e6 100644
--- a/sql/updates/world/3.3.5/2017_02_04_05_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_04_05_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_04_06_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_04_06_world.sql
index 52e21e37776..52e21e37776 100644
--- a/sql/updates/world/3.3.5/2017_02_04_06_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_04_06_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_04_07_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_04_07_world.sql
index a3038862c1b..a3038862c1b 100644
--- a/sql/updates/world/3.3.5/2017_02_04_07_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_04_07_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_04_08_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_04_08_world.sql
index da024b2312f..da024b2312f 100644
--- a/sql/updates/world/3.3.5/2017_02_04_08_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_04_08_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_04_09_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_04_09_world.sql
index 57d11362a93..57d11362a93 100644
--- a/sql/updates/world/3.3.5/2017_02_04_09_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_04_09_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_04_10_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_04_10_world.sql
index bf66ac79b8a..bf66ac79b8a 100644
--- a/sql/updates/world/3.3.5/2017_02_04_10_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_04_10_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_04_11_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_04_11_world.sql
index 263f05ffb26..263f05ffb26 100644
--- a/sql/updates/world/3.3.5/2017_02_04_11_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_04_11_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_04_12_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_04_12_world_335.sql
index 6e0d0d1b5fc..6e0d0d1b5fc 100644
--- a/sql/updates/world/3.3.5/2017_02_04_12_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_04_12_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_02_04_13_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_04_13_world_335.sql
index 9775011d7d4..9775011d7d4 100644
--- a/sql/updates/world/3.3.5/2017_02_04_13_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_04_13_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_02_04_14_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_04_14_world.sql
index ed889d3f03e..ed889d3f03e 100644
--- a/sql/updates/world/3.3.5/2017_02_04_14_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_04_14_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_04_15_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_04_15_world.sql
index fecb55a35ea..fecb55a35ea 100644
--- a/sql/updates/world/3.3.5/2017_02_04_15_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_04_15_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_04_16_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_04_16_world.sql
index 0c29cdad97c..0c29cdad97c 100644
--- a/sql/updates/world/3.3.5/2017_02_04_16_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_04_16_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_05_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_05_00_world.sql
index bc4e3f60759..bc4e3f60759 100644
--- a/sql/updates/world/3.3.5/2017_02_05_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_05_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_05_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_05_01_world.sql
index 33b796226ce..33b796226ce 100644
--- a/sql/updates/world/3.3.5/2017_02_05_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_05_01_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_05_02_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_05_02_world_335.sql
index dcc58fe82db..dcc58fe82db 100644
--- a/sql/updates/world/3.3.5/2017_02_05_02_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_05_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_02_05_03_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_05_03_world.sql
index 28c4cd4fb74..28c4cd4fb74 100644
--- a/sql/updates/world/3.3.5/2017_02_05_03_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_05_03_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_05_04_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_05_04_world.sql
index a74a08c3ffa..a74a08c3ffa 100644
--- a/sql/updates/world/3.3.5/2017_02_05_04_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_05_04_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_06_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_06_00_world.sql
index 69e47c93d53..69e47c93d53 100644
--- a/sql/updates/world/3.3.5/2017_02_06_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_06_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_06_01_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_06_01_world_335.sql
index 502f3db2a53..502f3db2a53 100644
--- a/sql/updates/world/3.3.5/2017_02_06_01_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_06_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_02_09_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_09_00_world.sql
index bb5fb921898..bb5fb921898 100644
--- a/sql/updates/world/3.3.5/2017_02_09_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_09_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_09_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_09_01_world.sql
index 8f014fed0be..8f014fed0be 100644
--- a/sql/updates/world/3.3.5/2017_02_09_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_09_01_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_10_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_10_00_world.sql
index 843fb5ee882..843fb5ee882 100644
--- a/sql/updates/world/3.3.5/2017_02_10_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_10_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_10_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_10_01_world.sql
index 03a982a9c6e..03a982a9c6e 100644
--- a/sql/updates/world/3.3.5/2017_02_10_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_10_01_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_10_02_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_10_02_world.sql
index d402c47570b..d402c47570b 100644
--- a/sql/updates/world/3.3.5/2017_02_10_02_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_10_02_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_10_03_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_10_03_world.sql
index 2489afc3f12..2489afc3f12 100644
--- a/sql/updates/world/3.3.5/2017_02_10_03_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_10_03_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_10_04_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_10_04_world.sql
index 147fbe07baf..147fbe07baf 100644
--- a/sql/updates/world/3.3.5/2017_02_10_04_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_10_04_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_12_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_12_00_world.sql
index 7a86fc91e34..7a86fc91e34 100644
--- a/sql/updates/world/3.3.5/2017_02_12_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_12_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_13_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_13_00_world.sql
index ae479f50a47..ae479f50a47 100644
--- a/sql/updates/world/3.3.5/2017_02_13_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_13_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_13_01_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_13_01_world_335.sql
index 6c66f0597fc..6c66f0597fc 100644
--- a/sql/updates/world/3.3.5/2017_02_13_01_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_13_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_02_13_02_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_13_02_world_335.sql
index 41eea5f69d7..41eea5f69d7 100644
--- a/sql/updates/world/3.3.5/2017_02_13_02_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_13_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_02_13_03_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_13_03_world_335.sql
index 51f2cebfc2d..51f2cebfc2d 100644
--- a/sql/updates/world/3.3.5/2017_02_13_03_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_13_03_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_02_14_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_14_00_world.sql
index ec9fc0ff161..ec9fc0ff161 100644
--- a/sql/updates/world/3.3.5/2017_02_14_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_14_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_17_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_17_00_world.sql
index 38c4f916e8e..38c4f916e8e 100644
--- a/sql/updates/world/3.3.5/2017_02_17_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_17_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_18_00_world_355.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_18_00_world_355.sql
index a0cde600df5..a0cde600df5 100644
--- a/sql/updates/world/3.3.5/2017_02_18_00_world_355.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_18_00_world_355.sql
diff --git a/sql/updates/world/3.3.5/2017_02_18_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_18_01_world.sql
index 128583316b9..128583316b9 100644
--- a/sql/updates/world/3.3.5/2017_02_18_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_18_01_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_18_02_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_18_02_world_335.sql
index 5d0f19fd147..5d0f19fd147 100644
--- a/sql/updates/world/3.3.5/2017_02_18_02_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_18_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_02_18_03_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_18_03_world.sql
index 9b193dafbf7..9b193dafbf7 100644
--- a/sql/updates/world/3.3.5/2017_02_18_03_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_18_03_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_19_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_19_00_world.sql
index 5a0e4427ce7..5a0e4427ce7 100644
--- a/sql/updates/world/3.3.5/2017_02_19_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_19_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_19_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_19_01_world.sql
index 4a79543cd28..4a79543cd28 100644
--- a/sql/updates/world/3.3.5/2017_02_19_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_19_01_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_19_02_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_19_02_world.sql
index 72bdf08122f..72bdf08122f 100644
--- a/sql/updates/world/3.3.5/2017_02_19_02_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_19_02_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_20_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_20_00_world.sql
index 464884e70ea..464884e70ea 100644
--- a/sql/updates/world/3.3.5/2017_02_20_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_20_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_20_01_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_20_01_world_335.sql
index b05b81cc2f4..b05b81cc2f4 100644
--- a/sql/updates/world/3.3.5/2017_02_20_01_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_20_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_02_20_02_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_20_02_world_335.sql
index 68fe1b2cad4..68fe1b2cad4 100644
--- a/sql/updates/world/3.3.5/2017_02_20_02_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_20_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_02_21_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_21_00_world.sql
index f337d3430d2..f337d3430d2 100644
--- a/sql/updates/world/3.3.5/2017_02_21_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_21_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_21_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_21_01_world.sql
index b38012ededd..b38012ededd 100644
--- a/sql/updates/world/3.3.5/2017_02_21_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_21_01_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_21_02_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_21_02_world.sql
index fa0f11d7f80..fa0f11d7f80 100644
--- a/sql/updates/world/3.3.5/2017_02_21_02_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_21_02_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_21_03_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_21_03_world.sql
index fa0ee09d11f..fa0ee09d11f 100644
--- a/sql/updates/world/3.3.5/2017_02_21_03_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_21_03_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_22_00_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_22_00_world_335.sql
index f53d32bc07f..f53d32bc07f 100644
--- a/sql/updates/world/3.3.5/2017_02_22_00_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_22_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_02_22_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_22_01_world.sql
index 81b94c67952..81b94c67952 100644
--- a/sql/updates/world/3.3.5/2017_02_22_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_22_01_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_22_02_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_22_02_world_335.sql
index 0969b9d7abe..0969b9d7abe 100644
--- a/sql/updates/world/3.3.5/2017_02_22_02_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_22_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_02_22_03_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_22_03_world_335.sql
index 6368031e578..6368031e578 100644
--- a/sql/updates/world/3.3.5/2017_02_22_03_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_22_03_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_02_22_04_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_22_04_world_335.sql
index 168d12529fb..168d12529fb 100644
--- a/sql/updates/world/3.3.5/2017_02_22_04_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_22_04_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_02_23_00_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_23_00_world_335.sql
index 9e1d657400d..9e1d657400d 100644
--- a/sql/updates/world/3.3.5/2017_02_23_00_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_23_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_02_23_01_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_23_01_world_335.sql
index 89858856417..89858856417 100644
--- a/sql/updates/world/3.3.5/2017_02_23_01_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_23_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_02_24_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_24_00_world.sql
index c22e3b7db94..c22e3b7db94 100644
--- a/sql/updates/world/3.3.5/2017_02_24_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_24_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_25_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_25_00_world.sql
index 71d78aa1d87..71d78aa1d87 100644
--- a/sql/updates/world/3.3.5/2017_02_25_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_25_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_02_28_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_28_00_world.sql
index 4ee3939e02d..4ee3939e02d 100644
--- a/sql/updates/world/3.3.5/2017_02_28_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_02_28_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_03_01_00_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_01_00_world_335.sql
index c68ea7514c0..c68ea7514c0 100644
--- a/sql/updates/world/3.3.5/2017_03_01_00_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_01_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_03_03_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_03_00_world.sql
index c8ed6d79e2a..c8ed6d79e2a 100644
--- a/sql/updates/world/3.3.5/2017_03_03_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_03_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_03_04_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_04_00_world.sql
index 874d19831ee..874d19831ee 100644
--- a/sql/updates/world/3.3.5/2017_03_04_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_04_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_03_04_01_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_04_01_world_335.sql
index 8297338fcc1..8297338fcc1 100644
--- a/sql/updates/world/3.3.5/2017_03_04_01_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_04_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_03_04_02_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_04_02_world_335.sql
index a988bc1d7a6..a988bc1d7a6 100644
--- a/sql/updates/world/3.3.5/2017_03_04_02_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_04_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_03_04_03_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_04_03_world.sql
index 3a474c2c59a..3a474c2c59a 100644
--- a/sql/updates/world/3.3.5/2017_03_04_03_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_04_03_world.sql
diff --git a/sql/updates/world/3.3.5/2017_03_04_04_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_04_04_world_335.sql
index 2e2c9366652..2e2c9366652 100644
--- a/sql/updates/world/3.3.5/2017_03_04_04_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_04_04_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_03_04_05_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_04_05_world.sql
index f670734e2e2..f670734e2e2 100644
--- a/sql/updates/world/3.3.5/2017_03_04_05_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_04_05_world.sql
diff --git a/sql/updates/world/3.3.5/2017_03_06_00_world_355.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_06_00_world_355.sql
index 34f29f50505..34f29f50505 100644
--- a/sql/updates/world/3.3.5/2017_03_06_00_world_355.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_06_00_world_355.sql
diff --git a/sql/updates/world/3.3.5/2017_03_06_01_world_355.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_06_01_world_355.sql
index 2b3de410bb0..2b3de410bb0 100644
--- a/sql/updates/world/3.3.5/2017_03_06_01_world_355.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_06_01_world_355.sql
diff --git a/sql/updates/world/3.3.5/2017_03_07_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_07_00_world.sql
index 22844e5c488..22844e5c488 100644
--- a/sql/updates/world/3.3.5/2017_03_07_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_07_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_03_13_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_13_00_world.sql
index d011b2f22d3..d011b2f22d3 100644
--- a/sql/updates/world/3.3.5/2017_03_13_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_13_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_03_15_00_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_15_00_world_335.sql
index ef13bf0ff2e..ef13bf0ff2e 100644
--- a/sql/updates/world/3.3.5/2017_03_15_00_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_15_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_03_16_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_16_00_world.sql
index 25ee49e66fd..25ee49e66fd 100644
--- a/sql/updates/world/3.3.5/2017_03_16_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_16_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_03_16_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_16_01_world.sql
index c08451f5f60..c08451f5f60 100644
--- a/sql/updates/world/3.3.5/2017_03_16_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_16_01_world.sql
diff --git a/sql/updates/world/3.3.5/2017_03_16_02_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_16_02_world.sql
index 73238acdff1..73238acdff1 100644
--- a/sql/updates/world/3.3.5/2017_03_16_02_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_16_02_world.sql
diff --git a/sql/updates/world/3.3.5/2017_03_17_00_world_355.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_17_00_world_355.sql
index bcdf6ae1460..bcdf6ae1460 100644
--- a/sql/updates/world/3.3.5/2017_03_17_00_world_355.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_17_00_world_355.sql
diff --git a/sql/updates/world/3.3.5/2017_03_17_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_17_01_world.sql
index 52e520c419f..52e520c419f 100644
--- a/sql/updates/world/3.3.5/2017_03_17_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_17_01_world.sql
diff --git a/sql/updates/world/3.3.5/2017_03_17_02_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_17_02_world.sql
index c026bbfe6da..c026bbfe6da 100644
--- a/sql/updates/world/3.3.5/2017_03_17_02_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_17_02_world.sql
diff --git a/sql/updates/world/3.3.5/2017_03_17_03_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_17_03_world.sql
index 32e90986900..32e90986900 100644
--- a/sql/updates/world/3.3.5/2017_03_17_03_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_17_03_world.sql
diff --git a/sql/updates/world/3.3.5/2017_03_19_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_19_00_world.sql
index b19feaae716..b19feaae716 100644
--- a/sql/updates/world/3.3.5/2017_03_19_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_19_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_03_20_00_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_20_00_world_335.sql
index f5c7b2375bb..f5c7b2375bb 100644
--- a/sql/updates/world/3.3.5/2017_03_20_00_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_20_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_03_20_01_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_20_01_world_335.sql
index a0bd400a2e5..a0bd400a2e5 100644
--- a/sql/updates/world/3.3.5/2017_03_20_01_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_20_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_03_24_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_24_00_world.sql
index 84277ee86c2..84277ee86c2 100644
--- a/sql/updates/world/3.3.5/2017_03_24_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_24_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_03_25_00_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_25_00_world_335.sql
index 62f775b10c1..62f775b10c1 100644
--- a/sql/updates/world/3.3.5/2017_03_25_00_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_25_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_03_25_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_25_01_world.sql
index 1e678704466..1e678704466 100644
--- a/sql/updates/world/3.3.5/2017_03_25_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_25_01_world.sql
diff --git a/sql/updates/world/3.3.5/2017_03_26_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_26_00_world.sql
index b9a1a69315f..b9a1a69315f 100644
--- a/sql/updates/world/3.3.5/2017_03_26_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_26_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_03_26_01_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_26_01_world_335.sql
index 106556ff7e2..106556ff7e2 100644
--- a/sql/updates/world/3.3.5/2017_03_26_01_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_26_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_03_26_02_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_26_02_world.sql
index 6795f016af9..6795f016af9 100644
--- a/sql/updates/world/3.3.5/2017_03_26_02_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_26_02_world.sql
diff --git a/sql/updates/world/3.3.5/2017_03_26_03_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_26_03_world.sql
index afd7ad16749..afd7ad16749 100644
--- a/sql/updates/world/3.3.5/2017_03_26_03_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_26_03_world.sql
diff --git a/sql/updates/world/3.3.5/2017_03_26_04_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_26_04_world.sql
index 83b2ae9a0d2..83b2ae9a0d2 100644
--- a/sql/updates/world/3.3.5/2017_03_26_04_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_26_04_world.sql
diff --git a/sql/updates/world/3.3.5/2017_03_26_05_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_26_05_world_335.sql
index d4465ea3ce4..d4465ea3ce4 100644
--- a/sql/updates/world/3.3.5/2017_03_26_05_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_26_05_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_03_27_00_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_27_00_world_335.sql
index 3d941c56bd0..3d941c56bd0 100644
--- a/sql/updates/world/3.3.5/2017_03_27_00_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_27_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_03_27_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_27_01_world.sql
index 7e6efe21b11..7e6efe21b11 100644
--- a/sql/updates/world/3.3.5/2017_03_27_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_27_01_world.sql
diff --git a/sql/updates/world/3.3.5/2017_03_30_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_30_00_world.sql
index 34186b209f8..34186b209f8 100644
--- a/sql/updates/world/3.3.5/2017_03_30_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_30_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_03_30_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_30_01_world.sql
index 2be7fb71ab0..2be7fb71ab0 100644
--- a/sql/updates/world/3.3.5/2017_03_30_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_30_01_world.sql
diff --git a/sql/updates/world/3.3.5/2017_03_30_02_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_30_02_world_335.sql
index 4c279f3a7a8..4c279f3a7a8 100644
--- a/sql/updates/world/3.3.5/2017_03_30_02_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_30_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_03_30_03_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_30_03_world.sql
index 78f8eca31d4..78f8eca31d4 100644
--- a/sql/updates/world/3.3.5/2017_03_30_03_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_30_03_world.sql
diff --git a/sql/updates/world/3.3.5/2017_03_31_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_31_00_world.sql
index 52ae3f95909..52ae3f95909 100644
--- a/sql/updates/world/3.3.5/2017_03_31_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_31_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_03_31_01_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_31_01_world_335.sql
index c1918289dc4..c1918289dc4 100644
--- a/sql/updates/world/3.3.5/2017_03_31_01_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_03_31_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_04_01_00_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_01_00_world_335.sql
index efa8fda0a69..efa8fda0a69 100644
--- a/sql/updates/world/3.3.5/2017_04_01_00_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_01_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_04_01_01_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_01_01_world_335.sql
index 93d48e15362..93d48e15362 100644
--- a/sql/updates/world/3.3.5/2017_04_01_01_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_01_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_04_01_02_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_01_02_world.sql
index 5a102ca6737..5a102ca6737 100644
--- a/sql/updates/world/3.3.5/2017_04_01_02_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_01_02_world.sql
diff --git a/sql/updates/world/3.3.5/2017_04_01_03_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_01_03_world.sql
index 713b352e5f6..713b352e5f6 100644
--- a/sql/updates/world/3.3.5/2017_04_01_03_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_01_03_world.sql
diff --git a/sql/updates/world/3.3.5/2017_04_01_04_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_01_04_world.sql
index acf5d7d8c0e..acf5d7d8c0e 100644
--- a/sql/updates/world/3.3.5/2017_04_01_04_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_01_04_world.sql
diff --git a/sql/updates/world/3.3.5/2017_04_02_00_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_02_00_world_335.sql
index c1a5ec8d97d..c1a5ec8d97d 100644
--- a/sql/updates/world/3.3.5/2017_04_02_00_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_02_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_04_02_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_02_01_world.sql
index dc6e6eeae90..dc6e6eeae90 100644
--- a/sql/updates/world/3.3.5/2017_04_02_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_02_01_world.sql
diff --git a/sql/updates/world/3.3.5/2017_04_02_02_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_02_02_world_335.sql
index 6a70842fd9c..6a70842fd9c 100644
--- a/sql/updates/world/3.3.5/2017_04_02_02_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_02_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_04_09_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_09_00_world.sql
index acdcd14322e..acdcd14322e 100644
--- a/sql/updates/world/3.3.5/2017_04_09_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_09_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_04_09_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_09_01_world.sql
index 2819d5eb006..2819d5eb006 100644
--- a/sql/updates/world/3.3.5/2017_04_09_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_09_01_world.sql
diff --git a/sql/updates/world/3.3.5/2017_04_09_02_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_09_02_world.sql
index 4912554985d..4912554985d 100644
--- a/sql/updates/world/3.3.5/2017_04_09_02_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_09_02_world.sql
diff --git a/sql/updates/world/3.3.5/2017_04_09_03_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_09_03_world_335.sql
index 8250841b137..8250841b137 100644
--- a/sql/updates/world/3.3.5/2017_04_09_03_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_09_03_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_04_10_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_10_00_world.sql
index e8dad7b9744..e8dad7b9744 100644
--- a/sql/updates/world/3.3.5/2017_04_10_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_10_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_04_11_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_11_00_world.sql
index ec4c5f491f4..ec4c5f491f4 100644
--- a/sql/updates/world/3.3.5/2017_04_11_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_11_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_04_12_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_12_00_world.sql
index d532af7b2e9..d532af7b2e9 100644
--- a/sql/updates/world/3.3.5/2017_04_12_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_12_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_04_13_00_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_13_00_world.sql
index 4125892d515..4125892d515 100644
--- a/sql/updates/world/3.3.5/2017_04_13_00_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_13_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_04_13_01_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_13_01_world.sql
index daebc81dd19..daebc81dd19 100644
--- a/sql/updates/world/3.3.5/2017_04_13_01_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_13_01_world.sql
diff --git a/sql/updates/world/3.3.5/2017_04_13_02_world.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_13_02_world.sql
index f723683d020..f723683d020 100644
--- a/sql/updates/world/3.3.5/2017_04_13_02_world.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_13_02_world.sql
diff --git a/sql/updates/world/3.3.5/2017_04_15_00_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_15_00_world_335.sql
index 91a463da2e1..91a463da2e1 100644
--- a/sql/updates/world/3.3.5/2017_04_15_00_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_15_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_04_15_01_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_15_01_world_335.sql
index 66318285af1..66318285af1 100644
--- a/sql/updates/world/3.3.5/2017_04_15_01_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_15_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_04_17_00_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_17_00_world_335.sql
index ba0ce724ac4..ba0ce724ac4 100644
--- a/sql/updates/world/3.3.5/2017_04_17_00_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_17_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2017_04_18_00_world_335.sql b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_18_00_world_335.sql
index 1ab4ea167c9..1ab4ea167c9 100644
--- a/sql/updates/world/3.3.5/2017_04_18_00_world_335.sql
+++ b/sql/old/3.3.5a/world/62_2017_04_18/2017_04_18_00_world_335.sql
diff --git a/sql/updates/auth/3.3.5/2017_04_19_00_auth.sql b/sql/updates/auth/3.3.5/2017_04_19_00_auth.sql
new file mode 100644
index 00000000000..408232900ea
--- /dev/null
+++ b/sql/updates/auth/3.3.5/2017_04_19_00_auth.sql
@@ -0,0 +1,2 @@
+-- TDB 335.63 auth
+UPDATE `updates` SET `state`='ARCHIVED';
diff --git a/sql/updates/characters/3.3.5/2017_04_19_00_characters.sql b/sql/updates/characters/3.3.5/2017_04_19_00_characters.sql
new file mode 100644
index 00000000000..df58c16eec1
--- /dev/null
+++ b/sql/updates/characters/3.3.5/2017_04_19_00_characters.sql
@@ -0,0 +1,2 @@
+-- TDB 335.63 characters
+UPDATE `updates` SET `state`='ARCHIVED';
diff --git a/sql/updates/world/3.3.5/2017_04_19_00_world.sql b/sql/updates/world/3.3.5/2017_04_19_00_world.sql
new file mode 100644
index 00000000000..42542b889b6
--- /dev/null
+++ b/sql/updates/world/3.3.5/2017_04_19_00_world.sql
@@ -0,0 +1,3 @@
+-- TDB 335.63 world
+UPDATE `version` SET `db_version`='TDB 335.63', `cache_id`=63 LIMIT 1;
+UPDATE `updates` SET `state`='ARCHIVED';