Index: branches/RC/core/install/upgrades.sql
===================================================================
diff -u -r11495 -r11504
--- branches/RC/core/install/upgrades.sql	(.../upgrades.sql)	(revision 11495)
+++ branches/RC/core/install/upgrades.sql	(.../upgrades.sql)	(revision 11504)
@@ -1013,6 +1013,8 @@
 
 ALTER TABLE Language ADD UserDocsUrl VARCHAR(255) NOT NULL;
 
+UPDATE Category SET Template = CategoryTemplate WHERE CategoryTemplate <> '';
+
 ALTER TABLE Category
 	ADD ThemeId INT UNSIGNED NOT NULL,
 	ADD INDEX (ThemeId),
@@ -1021,8 +1023,16 @@
 	ADD COLUMN UseMenuIconUrl tinyint(3) unsigned NOT NULL default '0' AFTER ExternalUrl,
 	ADD COLUMN MenuIconUrl varchar(255) NOT NULL default '' AFTER UseMenuIconUrl,
 	CHANGE MetaKeywords MetaKeywords TEXT,
-	CHANGE MetaDescription MetaDescription TEXT;
+	CHANGE MetaDescription MetaDescription TEXT,
+	CHANGE CachedCategoryTemplate CachedTemplate VARCHAR(255) NOT NULL,
+	DROP CategoryTemplate;
 
+UPDATE Category SET l1_MenuTitle = l1_Name WHERE l1_MenuTitle = '' OR l1_MenuTitle LIKE '_Auto: %';
+UPDATE Category SET l2_MenuTitle = l2_Name WHERE l2_MenuTitle = '' OR l2_MenuTitle LIKE '_Auto: %';
+UPDATE Category SET l3_MenuTitle = l3_Name WHERE l3_MenuTitle = '' OR l3_MenuTitle LIKE '_Auto: %';
+UPDATE Category SET l4_MenuTitle = l4_Name WHERE l4_MenuTitle = '' OR l4_MenuTitle LIKE '_Auto: %';
+UPDATE Category SET l5_MenuTitle = l5_Name WHERE l5_MenuTitle = '' OR l5_MenuTitle LIKE '_Auto: %';
+
 CREATE TABLE PageContent (
   PageContentId int(11) NOT NULL auto_increment,
   ContentNum int(11) NOT NULL default '0',
