diff --git a/backup/restorelib.php b/backup/restorelib.php
index b745ecbeb9d..fcdfd5827dc 100644
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -1382,6 +1382,19 @@
                     $user->lang = 'mi_nt';
                 }
 
+                //Country list updates - MDL-13060 
+                //Any user whose country code has been deleted or modified needs to be assigned a valid one.
+                $country_update_map = array(
+                    'ZR' => 'CD', 
+                    'TP' => 'TL',
+                    'FX' => 'FR', 
+                    'KO' => 'RS', 
+                    'CS' => 'RS',
+                    'WA' => 'GB');
+                if (array_key_exists($user->country, $country_update_map)) {
+                    $user->country = $country_update_map[$user->country];
+                }
+
                 //Check if it's admin and coursecreator
                 $is_admin =         !empty($user->roles['admin']);
                 $is_coursecreator = !empty($user->roles['coursecreator']);
diff --git a/lang/en_utf8/countries.php b/lang/en_utf8/countries.php
index a531b6aa22d..c9ccb1797ca 100644
--- a/lang/en_utf8/countries.php
+++ b/lang/en_utf8/countries.php
@@ -1,246 +1,260 @@
-<?php // $Id$ 
-      // countries.php - created with Moodle 1.2 development (2003111400)
+<?PHP // $Id$
+      // countries.php - created with Moodle 1.7 beta + (2006101003)
+      // http://www.iso.org/iso/country_codes/iso_3166_code_lists.htm
+      //
+      // UPDATE NOTE - When country codes are deleted or re-assigned, 
+      // you must re-assign users to a valid country, doing both:
+      // 1 - add an upgrade path in /lib/db/upgrade.php
+      // 2 - add a line in the $country_update_map array, in 
+      //     /backup/restorelib.php 
 
-
-$string['AD'] = 'Andorra';
-$string['AE'] = 'United Arab Emirates';
 $string['AF'] = 'Afghanistan';
-$string['AG'] = 'Antigua and Barbuda';
-$string['AI'] = 'Anguilla';
+$string['AX'] = 'Åland Islands';
 $string['AL'] = 'Albania';
-$string['AM'] = 'Armenia';
-$string['AN'] = 'Netherlands Antilles';
-$string['AO'] = 'Angola';
-$string['AQ'] = 'Antarctica';
-$string['AR'] = 'Argentina';
+$string['DZ'] = 'Algeria';
 $string['AS'] = 'American Samoa';
-$string['AT'] = 'Austria';
-$string['AU'] = 'Australia';
+$string['AD'] = 'Andorra';
+$string['AO'] = 'Angola';
+$string['AI'] = 'Anguilla';
+$string['AQ'] = 'Antarctica';
+$string['AG'] = 'Antigua And Barbuda';
+$string['AR'] = 'Argentina';
+$string['AM'] = 'Armenia';
 $string['AW'] = 'Aruba';
+$string['AU'] = 'Australia';
+$string['AT'] = 'Austria';
 $string['AZ'] = 'Azerbaijan';
-$string['BA'] = 'Bosnia and Herzegovina';
-$string['BB'] = 'Barbados';
-$string['BD'] = 'Bangladesh';
-$string['BE'] = 'Belgium';
-$string['BF'] = 'Burkina Faso';
-$string['BG'] = 'Bulgaria';
+$string['BS'] = 'Bahamas';
 $string['BH'] = 'Bahrain';
-$string['BI'] = 'Burundi';
+$string['BD'] = 'Bangladesh';
+$string['BB'] = 'Barbados';
+$string['BY'] = 'Belarus';
+$string['BE'] = 'Belgium';
+$string['BZ'] = 'Belize';
 $string['BJ'] = 'Benin';
 $string['BM'] = 'Bermuda';
-$string['BN'] = 'Brunei Darussalam';
-$string['BO'] = 'Bolivia';
-$string['BR'] = 'Brazil';
-$string['BS'] = 'Bahamas';
 $string['BT'] = 'Bhutan';
-$string['BV'] = 'Bouvet Island';
+$string['BO'] = 'Bolivia';
+$string['BA'] = 'Bosnia And Herzegovina';
 $string['BW'] = 'Botswana';
-$string['BY'] = 'Belarus';
-$string['BZ'] = 'Belize';
-$string['CA'] = 'Canada';
-$string['CC'] = 'Cocos (Keeling) Islands';
-$string['CF'] = 'Central African Republic';
-$string['CG'] = 'Congo';
-$string['CH'] = 'Switzerland';
-$string['CI'] = 'Cote D\'Ivoire';
-$string['CK'] = 'Cook Islands';
-$string['CL'] = 'Chile';
+$string['BV'] = 'Bouvet Island';
+$string['BR'] = 'Brazil';
+$string['IO'] = 'British Indian Ocean Territory';
+$string['BN'] = 'Brunei Darussalam';
+$string['BG'] = 'Bulgaria';
+$string['BF'] = 'Burkina Faso';
+$string['BI'] = 'Burundi';
+$string['KH'] = 'Cambodia';
 $string['CM'] = 'Cameroon';
-$string['CN'] = 'China';
-$string['CO'] = 'Colombia';
-$string['CR'] = 'Costa Rica';
-$string['CS'] = 'Serbia and Montenegro';
-$string['CU'] = 'Cuba';
+$string['CA'] = 'Canada';
 $string['CV'] = 'Cape Verde';
+$string['KY'] = 'Cayman Islands';
+$string['CF'] = 'Central African Republic';
+$string['TD'] = 'Chad';
+$string['CL'] = 'Chile';
+$string['CN'] = 'China';
 $string['CX'] = 'Christmas Island';
+$string['CC'] = 'Cocos (Keeling) Islands';
+$string['CO'] = 'Colombia';
+$string['KM'] = 'Comoros';
+$string['CG'] = 'Congo';
+$string['CD'] = 'Congo, The Democratic Republic Of The';
+$string['CK'] = 'Cook Islands';
+$string['CR'] = 'Costa Rica';
+$string['CI'] = 'Côte D\'Ivoire';
+$string['HR'] = 'Croatia';
+$string['CU'] = 'Cuba';
 $string['CY'] = 'Cyprus';
 $string['CZ'] = 'Czech Republic';
-$string['DE'] = 'Germany';
-$string['DJ'] = 'Djibouti';
 $string['DK'] = 'Denmark';
+$string['DJ'] = 'Djibouti';
 $string['DM'] = 'Dominica';
 $string['DO'] = 'Dominican Republic';
-$string['DZ'] = 'Algeria';
 $string['EC'] = 'Ecuador';
-$string['EE'] = 'Estonia';
 $string['EG'] = 'Egypt';
-$string['EH'] = 'Western Sahara';
+$string['SV'] = 'El Salvador';
+$string['GQ'] = 'Equatorial Guinea';
 $string['ER'] = 'Eritrea';
-$string['ES'] = 'Spain';
+$string['EE'] = 'Estonia';
 $string['ET'] = 'Ethiopia';
-$string['FI'] = 'Finland';
-$string['FJ'] = 'Fiji';
 $string['FK'] = 'Falkland Islands (Malvinas)';
-$string['FM'] = 'Micronesia; Federated States of';
 $string['FO'] = 'Faroe Islands';
+$string['FJ'] = 'Fiji';
+$string['FI'] = 'Finland';
 $string['FR'] = 'France';
-$string['FX'] = 'France; Metropolitan';
-$string['GA'] = 'Gabon';
-$string['GB'] = 'United Kingdom';
-$string['GD'] = 'Grenada';
-$string['GE'] = 'Georgia';
 $string['GF'] = 'French Guiana';
+$string['PF'] = 'French Polynesia';
+$string['TF'] = 'French Southern Territories';
+$string['GA'] = 'Gabon';
+$string['GM'] = 'Gambia';
+$string['GE'] = 'Georgia';
+$string['DE'] = 'Germany';
 $string['GH'] = 'Ghana';
 $string['GI'] = 'Gibraltar';
-$string['GL'] = 'Greenland';
-$string['GM'] = 'Gambia';
-$string['GN'] = 'Guinea';
-$string['GP'] = 'Guadeloupe';
-$string['GQ'] = 'Equatorial Guinea';
 $string['GR'] = 'Greece';
-$string['GT'] = 'Guatemala';
+$string['GL'] = 'Greenland';
+$string['GD'] = 'Grenada';
+$string['GP'] = 'Guadeloupe';
 $string['GU'] = 'Guam';
+$string['GT'] = 'Guatemala';
+$string['GG'] = 'Guernsey';
+$string['GN'] = 'Guinea';
 $string['GW'] = 'Guinea-Bissau';
 $string['GY'] = 'Guyana';
-$string['HK'] = 'Hong Kong';
-$string['HM'] = 'Heard and Mc Donald Islands';
-$string['HN'] = 'Honduras';
-$string['HR'] = 'Croatia (Hrvatska)';
 $string['HT'] = 'Haiti';
+$string['HM'] = 'Heard Island And Mcdonald Islands';
+$string['VA'] = 'Holy See (Vatican City State)';
+$string['HN'] = 'Honduras';
+$string['HK'] = 'Hong Kong';
 $string['HU'] = 'Hungary';
-$string['ID'] = 'Indonesia';
-$string['IE'] = 'Ireland';
-$string['IL'] = 'Israel';
-$string['IN'] = 'India';
-$string['IO'] = 'British Indian Ocean Territory';
-$string['IQ'] = 'Iraq';
-$string['IR'] = 'Iran (Islamic Republic of)';
 $string['IS'] = 'Iceland';
+$string['IN'] = 'India';
+$string['ID'] = 'Indonesia';
+$string['IR'] = 'Iran, Islamic Republic Of';
+$string['IQ'] = 'Iraq';
+$string['IE'] = 'Ireland';
+$string['IM'] = 'Isle Of Man';
+$string['IL'] = 'Israel';
 $string['IT'] = 'Italy';
 $string['JM'] = 'Jamaica';
-$string['JO'] = 'Jordan';
 $string['JP'] = 'Japan';
-$string['KE'] = 'Kenya';
-$string['KG'] = 'Kyrgyzstan';
-$string['KH'] = 'Cambodia';
-$string['KI'] = 'Kiribati';
-$string['KM'] = 'Comoros';
-$string['KN'] = 'Saint Kitts and Nevis';
-$string['KO'] = 'Kosovo';
-$string['KP'] = 'Korea; Democratic People\'s Republic of';
-$string['KR'] = 'Korea; Republic of';
-$string['KW'] = 'Kuwait';
-$string['KY'] = 'Cayman Islands';
+$string['JE'] = 'Jersey';
+$string['JO'] = 'Jordan';
 $string['KZ'] = 'Kazakhstan';
-$string['LA'] = 'Lao People\'s Democratic Republic';
+$string['KE'] = 'Kenya';
+$string['KI'] = 'Kiribati';
+$string['KP'] = 'Korea, Democratic People\'S Republic Of';
+$string['KR'] = 'Korea, Republic Of';
+$string['KW'] = 'Kuwait';
+$string['KG'] = 'Kyrgyzstan';
+$string['LA'] = 'Lao People\'S Democratic Republic';
+$string['LV'] = 'Latvia';
 $string['LB'] = 'Lebanon';
-$string['LC'] = 'Saint Lucia';
-$string['LI'] = 'Liechtenstein';
-$string['LK'] = 'Sri Lanka';
-$string['LR'] = 'Liberia';
 $string['LS'] = 'Lesotho';
+$string['LR'] = 'Liberia';
+$string['LY'] = 'Libyan Arab Jamahiriya';
+$string['LI'] = 'Liechtenstein';
 $string['LT'] = 'Lithuania';
 $string['LU'] = 'Luxembourg';
-$string['LV'] = 'Latvia';
-$string['LY'] = 'Libyan Arab Jamahiriya';
-$string['MA'] = 'Morocco';
-$string['MC'] = 'Monaco';
-$string['MD'] = 'Moldova; Republic of';
+$string['MO'] = 'Macao';
+$string['MK'] = 'Macedonia, The Former Yugoslav Republic Of';
 $string['MG'] = 'Madagascar';
-$string['MH'] = 'Marshall Islands';
-$string['MK'] = 'Macedonia; Former Yugoslav Republic of';
+$string['MW'] = 'Malawi';
+$string['MY'] = 'Malaysia';
+$string['MV'] = 'Maldives';
 $string['ML'] = 'Mali';
-$string['MM'] = 'Myanmar';
-$string['MN'] = 'Mongolia';
-$string['MO'] = 'Macau';
-$string['MP'] = 'Northern Mariana Islands';
+$string['MT'] = 'Malta';
+$string['MH'] = 'Marshall Islands';
 $string['MQ'] = 'Martinique';
 $string['MR'] = 'Mauritania';
-$string['MS'] = 'Montserrat';
-$string['MT'] = 'Malta';
 $string['MU'] = 'Mauritius';
-$string['MV'] = 'Maldives';
-$string['MW'] = 'Malawi';
+$string['YT'] = 'Mayotte';
 $string['MX'] = 'Mexico';
-$string['MY'] = 'Malaysia';
+$string['FM'] = 'Micronesia, Federated States Of';
+$string['MD'] = 'Moldova, Republic Of';
+$string['MC'] = 'Monaco';
+$string['MN'] = 'Mongolia';
+$string['ME'] = 'Montenegro';
+$string['MS'] = 'Montserrat';
+$string['MA'] = 'Morocco';
 $string['MZ'] = 'Mozambique';
+$string['MM'] = 'Myanmar';
 $string['NA'] = 'Namibia';
-$string['NC'] = 'New Caledonia';
-$string['NE'] = 'Niger';
-$string['NF'] = 'Norfolk Island';
-$string['NG'] = 'Nigeria';
-$string['NI'] = 'Nicaragua';
-$string['NL'] = 'Netherlands';
-$string['NO'] = 'Norway';
-$string['NP'] = 'Nepal';
 $string['NR'] = 'Nauru';
-$string['NU'] = 'Niue';
+$string['NP'] = 'Nepal';
+$string['NL'] = 'Netherlands';
+$string['AN'] = 'Netherlands Antilles';
+$string['NC'] = 'New Caledonia';
 $string['NZ'] = 'New Zealand';
+$string['NI'] = 'Nicaragua';
+$string['NE'] = 'Niger';
+$string['NG'] = 'Nigeria';
+$string['NU'] = 'Niue';
+$string['NF'] = 'Norfolk Island';
+$string['MP'] = 'Northern Mariana Islands';
+$string['NO'] = 'Norway';
 $string['OM'] = 'Oman';
-$string['PA'] = 'Panama';
-$string['PE'] = 'Peru';
-$string['PF'] = 'French Polynesia';
-$string['PG'] = 'Papua New Guinea';
-$string['PH'] = 'Philippines';
 $string['PK'] = 'Pakistan';
-$string['PL'] = 'Poland';
-$string['PM'] = 'St. Pierre and Miquelon';
-$string['PN'] = 'Pitcairn';
-$string['PR'] = 'Puerto Rico';
-$string['PS'] = 'Palestine';
-$string['PT'] = 'Portugal';
 $string['PW'] = 'Palau';
+$string['PS'] = 'Palestinian Territory, Occupied';
+$string['PA'] = 'Panama';
+$string['PG'] = 'Papua New Guinea';
 $string['PY'] = 'Paraguay';
+$string['PE'] = 'Peru';
+$string['PH'] = 'Philippines';
+$string['PN'] = 'Pitcairn';
+$string['PL'] = 'Poland';
+$string['PT'] = 'Portugal';
+$string['PR'] = 'Puerto Rico';
 $string['QA'] = 'Qatar';
-$string['RE'] = 'Reunion';
+$string['RE'] = 'Réunion';
 $string['RO'] = 'Romania';
 $string['RU'] = 'Russian Federation';
 $string['RW'] = 'Rwanda';
-$string['SA'] = 'Saudi Arabia';
-$string['SB'] = 'Solomon Islands';
-$string['SC'] = 'Seychelles';
-$string['SD'] = 'Sudan';
-$string['SE'] = 'Sweden';
-$string['SG'] = 'Singapore';
-$string['SH'] = 'St. Helena';
-$string['SI'] = 'Slovenia';
-$string['SJ'] = 'Svalbard and Jan Mayen Islands';
-$string['SK'] = 'Slovakia (Slovak Republic)';
-$string['SL'] = 'Sierra Leone';
+$string['BL'] = 'Saint Barthélemy';
+$string['SH'] = 'Saint Helena';
+$string['KN'] = 'Saint Kitts And Nevis';
+$string['LC'] = 'Saint Lucia';
+$string['MF'] = 'Saint Martin';
+$string['PM'] = 'Saint Pierre And Miquelon';
+$string['VC'] = 'Saint Vincent And The Grenadines';
+$string['WS'] = 'Samoa';
 $string['SM'] = 'San Marino';
+$string['ST'] = 'Sao Tome And Principe';
+$string['SA'] = 'Saudi Arabia';
 $string['SN'] = 'Senegal';
+$string['RS'] = 'Serbia';
+$string['SC'] = 'Seychelles';
+$string['SL'] = 'Sierra Leone';
+$string['SG'] = 'Singapore';
+$string['SK'] = 'Slovakia';
+$string['SI'] = 'Slovenia';
+$string['SB'] = 'Solomon Islands';
 $string['SO'] = 'Somalia';
+$string['ZA'] = 'South Africa';
+$string['GS'] = 'South Georgia And The South Sandwich Islands';
+$string['ES'] = 'Spain';
+$string['LK'] = 'Sri Lanka';
+$string['SD'] = 'Sudan';
 $string['SR'] = 'Suriname';
-$string['ST'] = 'Sao Tome and Principe';
-$string['SV'] = 'El Salvador';
-$string['SY'] = 'Syrian Arab Republic';
+$string['SJ'] = 'Svalbard And Jan Mayen';
 $string['SZ'] = 'Swaziland';
-$string['TC'] = 'Turks and Caicos Islands';
-$string['TD'] = 'Chad';
-$string['TF'] = 'French Southern Territories';
-$string['TG'] = 'Togo';
-$string['TH'] = 'Thailand';
+$string['SE'] = 'Sweden';
+$string['CH'] = 'Switzerland';
+$string['SY'] = 'Syrian Arab Republic';
+$string['TW'] = 'Taiwan, Province Of China';
 $string['TJ'] = 'Tajikistan';
+$string['TZ'] = 'Tanzania, United Republic Of';
+$string['TH'] = 'Thailand';
+$string['TL'] = 'Timor-Leste';
+$string['TG'] = 'Togo';
 $string['TK'] = 'Tokelau';
-$string['TM'] = 'Turkmenistan';
-$string['TN'] = 'Tunisia';
 $string['TO'] = 'Tonga';
-$string['TP'] = 'East Timor';
+$string['TT'] = 'Trinidad And Tobago';
+$string['TN'] = 'Tunisia';
 $string['TR'] = 'Turkey';
-$string['TT'] = 'Trinidad and Tobago';
+$string['TM'] = 'Turkmenistan';
+$string['TC'] = 'Turks And Caicos Islands';
 $string['TV'] = 'Tuvalu';
-$string['TW'] = 'Taiwan';
-$string['TZ'] = 'Tanzania; United Republic of';
-$string['UA'] = 'Ukraine';
 $string['UG'] = 'Uganda';
-$string['US'] = 'United States of America';
+$string['UA'] = 'Ukraine';
+$string['AE'] = 'United Arab Emirates';
+$string['GB'] = 'United Kingdom';
+$string['US'] = 'United States';
+$string['UM'] = 'United States Minor Outlying Islands';
 $string['UY'] = 'Uruguay';
 $string['UZ'] = 'Uzbekistan';
-$string['VA'] = 'Vatican City State (Holy See)';
-$string['VC'] = 'Saint Vincent and the Grenadines';
-$string['VE'] = 'Venezuela';
-$string['VG'] = 'Virgin Islands (British)';
-$string['VI'] = 'Virgin Islands (U.S.)';
-$string['VN'] = 'Vietnam';
 $string['VU'] = 'Vanuatu';
-$string['WA'] = 'Wales';
-$string['WF'] = 'Wallis And Futuna Islands';
-$string['WS'] = 'Samoa';
+$string['VA'] = 'Vatican City State (Holy See)';
+$string['VE'] = 'Venezuela';
+$string['VN'] = 'Viet Nam';
+$string['VG'] = 'Virgin Islands, British';
+$string['VI'] = 'Virgin Islands, U.S.';
+$string['WF'] = 'Wallis And Futuna';
+$string['EH'] = 'Western Sahara';
 $string['YE'] = 'Yemen';
-$string['YT'] = 'Mayotte';
-$string['ZA'] = 'South Africa';
+$string['CD'] = 'Zaire';
 $string['ZM'] = 'Zambia';
-$string['ZR'] = 'Zaire';
 $string['ZW'] = 'Zimbabwe';
 
 ?>