diff --git a/administrator/components/com_banners/config.xml b/administrator/components/com_banners/config.xml
index 1e056e3777ec2..2c9f298c9523c 100644
--- a/administrator/components/com_banners/config.xml
+++ b/administrator/components/com_banners/config.xml
@@ -12,15 +12,15 @@
 			default="0"
 			>
 			<option
-				value="1">COM_BANNERS_FIELD_VALUE_1</option>
+				value="1">COM_BANNERS_FIELD_VALUE_UNLIMITED</option>
 			<option
-				value="2">COM_BANNERS_FIELD_VALUE_2</option>
+				value="2">COM_BANNERS_FIELD_VALUE_YEARLY</option>
 			<option
-				value="3">COM_BANNERS_FIELD_VALUE_3</option>
+				value="3">COM_BANNERS_FIELD_VALUE_MONTHLY</option>
 			<option
-				value="4">COM_BANNERS_FIELD_VALUE_4</option>
+				value="4">COM_BANNERS_FIELD_VALUE_WEEKLY</option>
 			<option
-				value="5">COM_BANNERS_FIELD_VALUE_5</option>
+				value="5">COM_BANNERS_FIELD_VALUE_DAILY</option>
 		</field>
 
 		<field
diff --git a/administrator/components/com_banners/models/forms/banner.xml b/administrator/components/com_banners/models/forms/banner.xml
index 77e591087bae2..51b66530d3abd 100644
--- a/administrator/components/com_banners/models/forms/banner.xml
+++ b/administrator/components/com_banners/models/forms/banner.xml
@@ -141,15 +141,15 @@
 			default="0">
 			<option value="-1">COM_BANNERS_FIELD_VALUE_USECLIENTDEFAULT
 			</option>
-			<option value="1">COM_BANNERS_FIELD_VALUE_1
+			<option value="1">COM_BANNERS_FIELD_VALUE_UNLIMITED
 			</option>
-			<option value="2">COM_BANNERS_FIELD_VALUE_2
+			<option value="2">COM_BANNERS_FIELD_VALUE_YEARLY
 			</option>
-			<option value="3">COM_BANNERS_FIELD_VALUE_3
+			<option value="3">COM_BANNERS_FIELD_VALUE_MONTHLY
 			</option>
-			<option value="4">COM_BANNERS_FIELD_VALUE_4
+			<option value="4">COM_BANNERS_FIELD_VALUE_WEEKLY
 			</option>
-			<option value="5">COM_BANNERS_FIELD_VALUE_5
+			<option value="5">COM_BANNERS_FIELD_VALUE_DAILY
 			</option>
 		</field>
 
diff --git a/administrator/components/com_banners/models/forms/client.xml b/administrator/components/com_banners/models/forms/client.xml
index a14cc0ac8bf21..0ff3a5bedb428 100644
--- a/administrator/components/com_banners/models/forms/client.xml
+++ b/administrator/components/com_banners/models/forms/client.xml
@@ -47,15 +47,15 @@
 		>
 			<option value="-1">JGLOBAL_USE_GLOBAL
 			</option>
-			<option value="1">COM_BANNERS_FIELD_VALUE_1
+			<option value="1">COM_BANNERS_FIELD_VALUE_UNLIMITED
 			</option>
-			<option value="2">COM_BANNERS_FIELD_VALUE_2
+			<option value="2">COM_BANNERS_FIELD_VALUE_YEARLY
 			</option>
-			<option value="3">COM_BANNERS_FIELD_VALUE_3
+			<option value="3">COM_BANNERS_FIELD_VALUE_MONTHLY
 			</option>
-			<option value="4">COM_BANNERS_FIELD_VALUE_4
+			<option value="4">COM_BANNERS_FIELD_VALUE_WEEKLY
 			</option>
-			<option value="5">COM_BANNERS_FIELD_VALUE_5
+			<option value="5">COM_BANNERS_FIELD_VALUE_DAILY
 			</option>
 		</field>
 
diff --git a/administrator/components/com_banners/models/forms/filter_clients.xml b/administrator/components/com_banners/models/forms/filter_clients.xml
index 2609e159f3975..ad0ac39e0fcba 100644
--- a/administrator/components/com_banners/models/forms/filter_clients.xml
+++ b/administrator/components/com_banners/models/forms/filter_clients.xml
@@ -25,11 +25,11 @@
 			onchange="this.form.submit();"
 		>
 			<option value="">COM_BANNERS_SELECT_TYPE</option>
-			<option value="1">COM_BANNERS_FIELD_VALUE_1</option>
-			<option value="2">COM_BANNERS_FIELD_VALUE_2</option>
-			<option value="3">COM_BANNERS_FIELD_VALUE_3</option>
-			<option value="4">COM_BANNERS_FIELD_VALUE_4</option>
-			<option value="5">COM_BANNERS_FIELD_VALUE_5</option>
+			<option value="1">COM_BANNERS_FIELD_VALUE_UNLIMITED</option>
+			<option value="2">COM_BANNERS_FIELD_VALUE_YEARLY</option>
+			<option value="3">COM_BANNERS_FIELD_VALUE_MONTHLY</option>
+			<option value="4">COM_BANNERS_FIELD_VALUE_WEEKLY</option>
+			<option value="5">COM_BANNERS_FIELD_VALUE_DAILY</option>
 		</field>
 	</fields>
 	<fields name="list">
diff --git a/administrator/components/com_config/model/application.php b/administrator/components/com_config/model/application.php
index 13ae11b23d387..fbb0babe49ec9 100644
--- a/administrator/components/com_config/model/application.php
+++ b/administrator/components/com_config/model/application.php
@@ -422,7 +422,7 @@ public function storePermissions($permission)
 
 				$result = $this->db->execute();
 
-				return $result;
+				return (bool) $result;
 			}
 		}
 		catch (Exception $e)
diff --git a/administrator/components/com_finder/models/index.php b/administrator/components/com_finder/models/index.php
index aee121c659b84..903e14822259b 100644
--- a/administrator/components/com_finder/models/index.php
+++ b/administrator/components/com_finder/models/index.php
@@ -194,11 +194,20 @@ protected function getListQuery()
 			$query->where('l.published = ' . (int) $this->getState('filter.state'));
 		}
 
-		// Check the search phrase.
+			// Check the search phrase.
 		if ($this->getState('filter.search') != '')
 		{
 			$search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($this->getState('filter.search')), true) . '%'));
-			$query->where('l.title LIKE ' . $search . ' OR l.url LIKE ' . $search . ' OR l.indexdate LIKE  ' . $search);
+
+			// Do not filter by indexdate if $search contains non-ascii characters
+			if (preg_match('/[^\x00-\x7F]/', $search))
+			{
+				$query->where('l.title LIKE ' . $search . ' OR l.url LIKE ' . $search);
+			}
+			else
+			{
+				$query->where('l.title LIKE ' . $search . ' OR l.url LIKE ' . $search . ' OR l.indexdate LIKE  ' . $search);
+			}
 		}
 
 		// Handle the list ordering.
diff --git a/administrator/components/com_finder/views/index/tmpl/default.php b/administrator/components/com_finder/views/index/tmpl/default.php
index e41b446a8c8e1..d9ced32826403 100644
--- a/administrator/components/com_finder/views/index/tmpl/default.php
+++ b/administrator/components/com_finder/views/index/tmpl/default.php
@@ -113,7 +113,7 @@
 					<td>
 						<?php echo JHtml::_('jgrid.published', $item->published, $i, 'index.', $canChange, 'cb'); ?>
 					</td>
-					<td>
+					<td class="pull-left break-word">
 						<label for="cb<?php echo $i ?>">
 							<strong>
 								<?php echo $this->escape($item->title); ?>
diff --git a/administrator/components/com_installer/models/database.php b/administrator/components/com_installer/models/database.php
index 240585779bb28..55b99502ec0e7 100644
--- a/administrator/components/com_installer/models/database.php
+++ b/administrator/components/com_installer/models/database.php
@@ -168,7 +168,6 @@ public function fixSchemaVersion($changeSet)
 	 *
 	 * @return  mixed   version if successful, false if fail.
 	 */
-
 	public function getUpdateVersion()
 	{
 		$table = JTable::getInstance('Extension');
@@ -270,7 +269,7 @@ public function convertTablesToUtf8mb4()
 		// Get the SQL file to convert the core tables. Yes, this is hardcoded because we have all sorts of index
 		// conversions and funky things we can't automate in core tables without an actual SQL file.
 		$serverType = $db->getServerType();
-		$fileName = JPATH_ADMINISTRATOR . "/components/com_admin/sql/updates/$serverType/3.5.0-2015-07-01.sql";
+		$fileName   = JPATH_ADMINISTRATOR . "/components/com_admin/sql/updates/$serverType/3.5.0-2015-07-01.sql";
 
 		if (!is_file($fileName))
 		{
@@ -278,7 +277,7 @@ public function convertTablesToUtf8mb4()
 		}
 
 		$fileContents = @file_get_contents($fileName);
-		$queries = $db->splitSql($fileContents);
+		$queries      = $db->splitSql($fileContents);
 
 		if (empty($queries))
 		{
diff --git a/administrator/language/en-GB/en-GB.com_banners.ini b/administrator/language/en-GB/en-GB.com_banners.ini
index a3159527014e1..df7658e6ec2a8 100644
--- a/administrator/language/en-GB/en-GB.com_banners.ini
+++ b/administrator/language/en-GB/en-GB.com_banners.ini
@@ -126,11 +126,17 @@ COM_BANNERS_FIELD_TRACKIMPRESSION_DESC="Record the impressions (views) of the ba
 COM_BANNERS_FIELD_TRACKIMPRESSION_LABEL="Track Impressions"
 COM_BANNERS_FIELD_TYPE_DESC="Choose the type of banner. Select Image to display an image from /images/banners/ folder. Select Custom to enter your custom code."
 COM_BANNERS_FIELD_TYPE_LABEL="Type"
+; The following five strings are deprecated and will be removed with 4.0. They generate wrong plural detection in Crowdin.
 COM_BANNERS_FIELD_VALUE_1="Unlimited"
 COM_BANNERS_FIELD_VALUE_2="Yearly"
 COM_BANNERS_FIELD_VALUE_3="Monthly"
 COM_BANNERS_FIELD_VALUE_4="Weekly"
 COM_BANNERS_FIELD_VALUE_5="Daily"
+COM_BANNERS_FIELD_VALUE_UNLIMITED="Unlimited"
+COM_BANNERS_FIELD_VALUE_YEARLY="Yearly"
+COM_BANNERS_FIELD_VALUE_MONTHLY="Monthly"
+COM_BANNERS_FIELD_VALUE_WEEKLY="Weekly"
+COM_BANNERS_FIELD_VALUE_DAILY="Daily"
 COM_BANNERS_FIELD_VALUE_CUSTOM="Custom"
 COM_BANNERS_FIELD_VALUE_IMAGE="Image"
 COM_BANNERS_FIELD_VALUE_USECLIENTDEFAULT="-- Use Client Default --"
diff --git a/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.ini b/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.ini
index dc1c62c731826..6a1cdfb6666f9 100644
--- a/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.ini
+++ b/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.ini
@@ -10,8 +10,11 @@ PLG_CAPTCHA_RECAPTCHA="CAPTCHA - reCAPTCHA"
 PLG_RECAPTCHA_VERSION_1_WARNING_LABEL="You have selected Version 1.0. All new sites should be using Version 2.0. Version 1.0 is only maintained to provide support for Global Site keys which are no longer available from Google."
 PLG_RECAPTCHA_VERSION_LABEL="Version"
 PLG_RECAPTCHA_VERSION_DESC="Version 2.0 is the recommended version. Version 1.0 is required if using deprecated Global reCAPTCHA keys."
+; The following two strings are deprecated and will be removed with 4.0. They generate wrong plural detection in Crowdin.
 PLG_RECAPTCHA_VERSION_1="1.0"
 PLG_RECAPTCHA_VERSION_2="2.0"
+PLG_RECAPTCHA_VERSION_V1="1.0"
+PLG_RECAPTCHA_VERSION_V2="2.0"
 PLG_RECAPTCHA_PUBLIC_KEY_LABEL="Site key"
 PLG_RECAPTCHA_PUBLIC_KEY_DESC="Used in the JavaScript code that is served to your users. See the plugin description for instructions on getting a site key."
 PLG_RECAPTCHA_PRIVATE_KEY_LABEL="Secret key"
diff --git a/administrator/language/en-GB/en-GB.plg_system_updatenotification.ini b/administrator/language/en-GB/en-GB.plg_system_updatenotification.ini
index 304a4b920bcfc..7ff58ca2bee7e 100644
--- a/administrator/language/en-GB/en-GB.plg_system_updatenotification.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_updatenotification.ini
@@ -4,20 +4,18 @@
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_SYSTEM_UPDATENOTIFICATION="System - Joomla! Update Notification"
-PLG_SYSTEM_UPDATENOTIFICATION_DESCRIPTION="This plugin periodically checks for the availability of new Joomla! versions. When one is found it will send you an email, reminding you to update Joomla!. Pro Tip: You can customise the email message by overriding the language string keys PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_SUBJECT and PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_BODY."
-
 PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_LBL="Super User Emails"
 PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_DESC="A comma separated list of the email addresses which will receive the update notification emails. The addresses in the list MUST belong to existing users of your site who have the Super User privilege. If none of the listed emails belongs to Super Users, or if it's left blank, all Super Users of this site will receive the update notification email."
 PLG_SYSTEM_UPDATENOTIFICATION_LANGUAGE_OVERRIDE_LBL="Email language"
-PLG_SYSTEM_UPDATENOTIFICATION_LANGUAGE_OVERRIDE_DESC="If you choose Auto (default), the update notification email to Super Users will be in the logged in user's front-end language at the time the plugin is triggered. In multi-language sites this can create confusion: the user's language may be one the Super User receiving the email doesn't speak. By selecting a language here you are forcing the update notification emails to be sent in this specific language."
+PLG_SYSTEM_UPDATENOTIFICATION_LANGUAGE_OVERRIDE_DESC="If you choose Auto (default), the update notification email to Super Users will be in the site language at the time the plugin is triggered. By selecting a language here you are forcing the update notification emails to be sent in this specific language."
 PLG_SYSTEM_UPDATENOTIFICATION_LANGUAGE_OVERRIDE_NONE="Auto"
-
 ; You can use the following merge codes:
 ; [NEWVERSION]		New Joomla! version, e.g. 1.2.3
 ; [CURVERSION]		Currently installed Joomla! version, e.g. 1.2.0
 ; [SITENAME]		Site name, as set in Global Configuration.
 ; [URL]				URL of the site's front-end page.
 ; [LINK]			Update URL (link to com_joomlaupdate, will request login if the Super User isn't already logged in).
-; \n				Newline character. Use it to start a new line in the email. NO LINE SHOULD EXCEED 300 CHARACTERS!
+; \n				Newline character. Use it to start a new line in the email.
 PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_SUBJECT="Joomla! Update available for [SITENAME] – [URL]"
-PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_BODY="This email IS NOT sent by Joomla.org. It is sent automatically by your own site,\n[SITENAME]\n\n================================================================================\nUPDATE INFORMATION\n================================================================================\n\nYour site has discovered that there is an updated version of Joomla! available\nfor download.\n\nJoomla! version currently installed:        [CURVERSION]\nJoomla! version available for installation: [NEWVERSION]\n\nThis email is sent to you by your site to remind you of this fact. The Joomla!\nproject will never contact you directly about available updates of Joomla! on\nyour site.\n\n================================================================================\nUPDATE INSTRUCTIONS\n================================================================================\n\nTo install the update on [SITENAME] please click the following link. (If the URL\nis not a link, simply copy & paste it to your browser).\n\nUpdate link: [LINK]\n\n================================================================================\nWHY AM I RECEIVING THIS EMAIL?\n================================================================================\n\nThis email has been automatically sent by a plugin provided by Joomla!, the\nsoftware which powers your site. This plugin looks for updated versions of\nJoomla! and sends an email notification to its administrators. You will receive\nseveral similar emails from your site until you either update the software or\ndisable these emails.\n\nTo disable these emails, please unpublish the 'System - Joomla! Update\nNotification' plugin in the Plugin Manager on your site.\n\nIf you do not understand what is Joomla! and what you need to do please do not\ncontact the Joomla! project. They are NOT sending you this email and they cannot\nhelp you. Instead, please contact the person who built or manages your site.\n\nIf you are the person who built or manages your website, please note that this\nplugin may have been activated automatically when you installed or updated Joomla!\non your site.\n\n================================================================================\nWHO SENT ME THIS EMAIL?\n================================================================================\n\nThis email is sent to you by your own site, [SITENAME]"
\ No newline at end of file
+PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_BODY="This email IS NOT sent by Joomla.org. It is sent automatically by your own site,\n[SITENAME]\n\n================================================================================\nUPDATE INFORMATION\n================================================================================\n\nYour site has discovered that there is an updated version of Joomla! available for download.\n\nJoomla! version currently installed:        [CURVERSION]\nJoomla! version available for installation: [NEWVERSION]\n\nThis email is sent to you by your site to remind you of this fact./nThe Joomla! project will never contact you directly about available updates of Joomla! on your site.\n\n================================================================================\nUPDATE INSTRUCTIONS\n================================================================================\n\nTo install the update on [SITENAME] please click the following link. (If the URL is not a link, simply copy & paste it to your browser).\n\nUpdate link: [LINK]\n\n================================================================================\nWHY AM I RECEIVING THIS EMAIL?\n================================================================================\n\nThis email has been automatically sent by a plugin provided by Joomla!, the software which powers your site.\nThis plugin looks for updated versions of Joomla! and sends an email notification to its administrators.\nYou will receive several similar emails from your site until you either update the software or disable these emails.\n\nTo disable these emails, please unpublish the 'System - Joomla! Update Notification' plugin in the Plugin Manager on your site.\n\nIf you do not understand what is Joomla! and what you need to do please do not contact the Joomla! project.\nThey are NOT sending you this email and they cannot help you. Instead, please contact the person who built or manages your site.\n\nIf you are the person who built or manages your website, please note that this plugin may have been activated automatically when you installed or updated Joomla! on your site.\n\n================================================================================\nWHO SENT ME THIS EMAIL?\n================================================================================\n\nThis email is sent to you by your own site, [SITENAME]"
+PLG_SYSTEM_UPDATENOTIFICATION_XML_DESCRIPTION="This plugin periodically checks for the availability of new Joomla! versions. When one is found it will send you an email, reminding you to update Joomla!. Pro Tip: You can customise the email message by overriding the language string keys PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_SUBJECT and PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_BODY."
diff --git a/administrator/language/en-GB/en-GB.plg_system_updatenotification.sys.ini b/administrator/language/en-GB/en-GB.plg_system_updatenotification.sys.ini
index 894a51561a1ca..900397db01347 100644
--- a/administrator/language/en-GB/en-GB.plg_system_updatenotification.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_updatenotification.sys.ini
@@ -4,4 +4,4 @@
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_SYSTEM_UPDATENOTIFICATION="System - Joomla! Update Notification"
-PLG_SYSTEM_UPDATENOTIFICATION_DESCRIPTION="This plugin periodically checks for the availability of new Joomla! versions. When one is found it will send you an email, reminding you to update Joomla!. Pro Tip: You can customise the email message by overriding the language string keys PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_SUBJECT and PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_BODY."
\ No newline at end of file
+PLG_SYSTEM_UPDATENOTIFICATION_XML_DESCRIPTION="This plugin periodically checks for the availability of new Joomla! versions. When one is found it will send you an email, reminding you to update Joomla!. Pro Tip: You can customise the email message by overriding the language string keys PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_SUBJECT and PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_BODY."
\ No newline at end of file
diff --git a/administrator/templates/hathor/html/com_finder/index/default.php b/administrator/templates/hathor/html/com_finder/index/default.php
index 5ea10c56c81bb..a8b86e9970241 100644
--- a/administrator/templates/hathor/html/com_finder/index/default.php
+++ b/administrator/templates/hathor/html/com_finder/index/default.php
@@ -130,7 +130,7 @@
 				<th class="center">
 					<?php echo JHtml::_('grid.id', $i, $item->link_id); ?>
 				</th>
-				<td>
+				<td class="pull-left break-word">
 					<?php if ((int) $item->publish_start_date or (int) $item->publish_end_date or (int) $item->start_date or (int) $item->end_date) : ?>
 					<img src="<?php echo JUri::root();?>/media/system/images/calendar.png" style="border:1px;float:right" class="hasTooltip" title="<?php echo JHtml::tooltipText(JText::sprintf('COM_FINDER_INDEX_DATE_INFO', $item->publish_start_date, $item->publish_end_date, $item->start_date, $item->end_date), '', 0); ?>" />
 					<?php endif; ?>
diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql
index 8e193919ae3b4..9e9e046f6a699 100644
--- a/installation/sql/mysql/joomla.sql
+++ b/installation/sql/mysql/joomla.sql
@@ -108,7 +108,7 @@ CREATE TABLE IF NOT EXISTS `#__banners` (
   `cid` int(11) NOT NULL DEFAULT 0,
   `type` int(11) NOT NULL DEFAULT 0,
   `name` varchar(255) NOT NULL DEFAULT '',
-  `alias` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '',
+  `alias` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '',
   `imptotal` int(11) NOT NULL DEFAULT 0,
   `impmade` int(11) NOT NULL DEFAULT 0,
   `clicks` int(11) NOT NULL DEFAULT 0,
@@ -205,7 +205,7 @@ CREATE TABLE IF NOT EXISTS `#__categories` (
   `path` varchar(255) NOT NULL DEFAULT '',
   `extension` varchar(50) NOT NULL DEFAULT '',
   `title` varchar(255) NOT NULL,
-  `alias` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '',
+  `alias` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '',
   `note` varchar(255) NOT NULL DEFAULT '',
   `description` mediumtext NOT NULL,
   `published` tinyint(1) NOT NULL DEFAULT 0,
@@ -254,7 +254,7 @@ INSERT INTO `#__categories` (`id`, `asset_id`, `parent_id`, `lft`, `rgt`, `level
 CREATE TABLE IF NOT EXISTS `#__contact_details` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `name` varchar(255) NOT NULL DEFAULT '',
-  `alias` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '',
+  `alias` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '',
   `con_position` varchar(255) DEFAULT NULL,
   `address` text,
   `suburb` varchar(100) DEFAULT NULL,
@@ -316,7 +316,7 @@ CREATE TABLE IF NOT EXISTS `#__content` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `asset_id` int(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
   `title` varchar(255) NOT NULL DEFAULT '',
-  `alias` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '',
+  `alias` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '',
   `introtext` mediumtext NOT NULL,
   `fulltext` mediumtext NOT NULL,
   `state` tinyint(3) NOT NULL DEFAULT 0,
@@ -1216,7 +1216,7 @@ CREATE TABLE IF NOT EXISTS `#__menu` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `menutype` varchar(24) NOT NULL COMMENT 'The type of menu this item belongs to. FK to #__menu_types.menutype',
   `title` varchar(255) NOT NULL COMMENT 'The display title of the menu item.',
-  `alias` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT 'The SEF alias of the menu item.',
+  `alias` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT 'The SEF alias of the menu item.',
   `note` varchar(255) NOT NULL DEFAULT '',
   `path` varchar(1024) NOT NULL COMMENT 'The computed path of the menu item based on the alias field.',
   `link` varchar(1024) NOT NULL COMMENT 'The actually link the menu item refers to.',
@@ -1426,7 +1426,7 @@ CREATE TABLE IF NOT EXISTS `#__newsfeeds` (
   `catid` int(11) NOT NULL DEFAULT 0,
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `name` varchar(100) NOT NULL DEFAULT '',
-  `alias` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '',
+  `alias` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '',
   `link` varchar(200) NOT NULL DEFAULT '',
   `published` tinyint(1) NOT NULL DEFAULT 0,
   `numarticles` int(10) unsigned NOT NULL DEFAULT 1,
@@ -1577,7 +1577,7 @@ CREATE TABLE IF NOT EXISTS `#__tags` (
   `level` int(10) unsigned NOT NULL DEFAULT 0,
   `path` varchar(255) NOT NULL DEFAULT '',
   `title` varchar(255) NOT NULL,
-  `alias` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '',
+  `alias` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '',
   `note` varchar(255) NOT NULL DEFAULT '',
   `description` mediumtext NOT NULL,
   `published` tinyint(1) NOT NULL DEFAULT 0,
@@ -1672,7 +1672,7 @@ CREATE TABLE IF NOT EXISTS `#__ucm_content` (
   `core_content_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `core_type_alias` varchar(255) NOT NULL DEFAULT '' COMMENT 'FK to the content types table',
   `core_title` varchar(255) NOT NULL,
-  `core_alias` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '',
+  `core_alias` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '',
   `core_body` mediumtext NOT NULL,
   `core_state` tinyint(1) NOT NULL DEFAULT 0,
   `core_checked_out_time` varchar(255) NOT NULL DEFAULT '',
diff --git a/libraries/cms/schema/changeitem.php b/libraries/cms/schema/changeitem.php
index a7dee9ee18582..ddcf982658b52 100644
--- a/libraries/cms/schema/changeitem.php
+++ b/libraries/cms/schema/changeitem.php
@@ -240,7 +240,8 @@ public function fix()
 		if ($this->checkStatus === -2)
 		{
 			// At this point we have a failed query
-			$this->db->setQuery($this->updateQuery);
+			$query = $this->db->convertUtf8mb4QueryToUtf8($this->updateQuery);
+			$this->db->setQuery($query);
 
 			if ($this->db->execute())
 			{
diff --git a/libraries/joomla/crypt/crypt.php b/libraries/joomla/crypt/crypt.php
index 429944ce8b8b5..4d7ffe584b36f 100644
--- a/libraries/joomla/crypt/crypt.php
+++ b/libraries/joomla/crypt/crypt.php
@@ -254,8 +254,11 @@ public static function genRandomBytes($length = 16)
 	}
 
 	/**
-	 * A timing safe comparison method. This defeats hacking
-	 * attempts that use timing based attack vectors.
+	 * A timing safe comparison method.
+	 *
+	 * This defeats hacking attempts that use timing based attack vectors.
+	 *
+	 * NOTE: Length will leak.
 	 *
 	 * @param   string  $known    A known string to check against.
 	 * @param   string  $unknown  An unknown string to check.
@@ -266,12 +269,18 @@ public static function genRandomBytes($length = 16)
 	 */
 	public static function timingSafeCompare($known, $unknown)
 	{
+		// Prefer PHP's hash_equals function (PHP 5.6+) if available
+		if (function_exists('hash_equals'))
+		{
+			return hash_equals((string) $known, (string) $unknown);
+		}
+
 		// Prevent issues if string length is 0
 		$known .= chr(0);
 		$unknown .= chr(0);
 
-		$knownLength = strlen($known);
-		$unknownLength = strlen($unknown);
+		$knownLength = static::safeStrlen($known);
+		$unknownLength = static::safeStrlen($unknown);
 
 		// Set the result to the difference between the lengths
 		$result = $knownLength - $unknownLength;
@@ -311,4 +320,91 @@ public static function hasStrongPasswordSupport()
 
 		return true;
 	}
+
+	/**
+	 * Safely detect a string's length
+	 *
+	 * This method is derived from \ParagonIE\Halite\Util::safeStrlen()
+	 *
+	 * @param   string  $str  String to check the length of
+	 *
+	 * @return  integer
+	 *
+	 * @since   3.5
+	 * @ref     mbstring.func_overload
+	 * @throws  RuntimeException
+	 */
+	public static function safeStrlen($str)
+	{
+		static $exists = null;
+
+		if ($exists === null)
+		{
+			$exists = function_exists('mb_strlen');
+		}
+
+		if ($exists)
+		{
+			$length = mb_strlen($str, '8bit');
+
+			if ($length === false)
+			{
+				throw new RuntimeException('mb_strlen() failed unexpectedly');
+			}
+
+			return $length;
+		}
+
+		// If we reached here, we can rely on strlen to count bytes:
+		return \strlen($str);
+	}
+
+	/**
+	 * Safely extract a substring
+	 *
+	 * This method is derived from \ParagonIE\Halite\Util::safeSubstr()
+	 *
+	 * @param   string   $str     The string to extract the substring from
+	 * @param   integer  $start   The starting position to extract from
+	 * @param   integer  $length  The length of the string to return
+	 *
+	 * @return  string
+	 *
+	 * @since   3.5
+	 */
+	public static function safeSubstr($str, $start, $length = null)
+	{
+		static $exists = null;
+
+		if ($exists === null)
+		{
+			$exists = function_exists('mb_substr');
+		}
+
+		if ($exists)
+		{
+			// In PHP 5.3 mb_substr($str, 0, NULL, '8bit') returns an empty string, so we have to find the length ourselves.
+			if ($length === null)
+			{
+				if ($start >= 0)
+				{
+					$length = static::safeStrlen($str) - $start;
+				}
+				else
+				{
+					$length = -$start;
+				}
+			}
+
+			return mb_substr($str, $start, $length, '8bit');
+		}
+
+		// Unlike mb_substr(), substr() doesn't accept NULL for length
+		if ($length !== null)
+		{
+			return substr($str, $start, $length);
+		}
+
+		return substr($str, $start);
+	}
 }
diff --git a/libraries/joomla/crypt/password.php b/libraries/joomla/crypt/password.php
index 4ea572b43052d..cb3065900b28c 100644
--- a/libraries/joomla/crypt/password.php
+++ b/libraries/joomla/crypt/password.php
@@ -12,7 +12,8 @@
 /**
  * Joomla Platform Password Hashing Interface
  *
- * @since  12.2
+ * @since       12.2
+ * @deprecated  4.0  Use PHP 5.5's native password hashing API
  */
 interface JCryptPassword
 {
@@ -33,6 +34,7 @@ interface JCryptPassword
 	 * @return  string  The hashed password.
 	 *
 	 * @since   12.2
+	 * @deprecated  4.0  Use PHP 5.5's native password hashing API
 	 */
 	public function create($password, $type = null);
 
@@ -45,6 +47,7 @@ public function create($password, $type = null);
 	 * @return  boolean  True if the password is valid, false otherwise.
 	 *
 	 * @since   12.2
+	 * @deprecated  4.0  Use PHP 5.5's native password hashing API
 	 */
 	public function verify($password, $hash);
 
@@ -56,6 +59,7 @@ public function verify($password, $hash);
 	 * @return  void
 	 *
 	 * @since   12.3
+	 * @deprecated  4.0  Use PHP 5.5's native password hashing API
 	 */
 	public function setDefaultType($type);
 
@@ -65,6 +69,7 @@ public function setDefaultType($type);
 	 * @return  void
 	 *
 	 * @since   12.3
+	 * @deprecated  4.0  Use PHP 5.5's native password hashing API
 	 */
 	public function getDefaultType();
 }
diff --git a/libraries/joomla/crypt/password/simple.php b/libraries/joomla/crypt/password/simple.php
index 30f791da19767..2e104a9d0dab3 100644
--- a/libraries/joomla/crypt/password/simple.php
+++ b/libraries/joomla/crypt/password/simple.php
@@ -12,19 +12,22 @@
 /**
  * Joomla Platform Password Crypter
  *
- * @since  12.2
+ * @since       12.2
+ * @deprecated  4.0  Use PHP 5.5's native password hashing API
  */
 class JCryptPasswordSimple implements JCryptPassword
 {
 	/**
 	 * @var    integer  The cost parameter for hashing algorithms.
 	 * @since  12.2
+	 * @deprecated  4.0  Use PHP 5.5's native password hashing API
 	 */
 	protected $cost = 10;
 
 	/**
 	 * @var    string   The default hash type
 	 * @since  12.3
+	 * @deprecated  4.0  Use PHP 5.5's native password hashing API
 	 */
 	protected $defaultType = '$2y$';
 
@@ -38,6 +41,7 @@ class JCryptPasswordSimple implements JCryptPassword
 	 *
 	 * @since   12.2
 	 * @throws  InvalidArgumentException
+	 * @deprecated  4.0  Use PHP 5.5's native password hashing API
 	 */
 	public function create($password, $type = null)
 	{
@@ -88,6 +92,7 @@ public function create($password, $type = null)
 	 * @return  void
 	 *
 	 * @since   12.2
+	 * @deprecated  4.0  Use PHP 5.5's native password hashing API
 	 */
 	public function setCost($cost)
 	{
@@ -102,6 +107,7 @@ public function setCost($cost)
 	 * @return  string  The string of random characters.
 	 *
 	 * @since   12.2
+	 * @deprecated  4.0  Use PHP 5.5's native password hashing API
 	 */
 	protected function getSalt($length)
 	{
@@ -121,6 +127,7 @@ protected function getSalt($length)
 	 * @return  boolean  True if the password is valid, false otherwise.
 	 *
 	 * @since   12.2
+	 * @deprecated  4.0  Use PHP 5.5's native password hashing API
 	 */
 	public function verify($password, $hash)
 	{
@@ -148,7 +155,7 @@ public function verify($password, $hash)
 		// Check if the hash is a Joomla hash.
 		if (preg_match('#[a-z0-9]{32}:[A-Za-z0-9]{32}#', $hash) === 1)
 		{
-			return md5($password . substr($hash, 33)) == substr($hash, 0, 32);
+			return md5($password . substr($hash, 33)) === substr($hash, 0, 32);
 		}
 
 		return false;
@@ -162,6 +169,7 @@ public function verify($password, $hash)
 	 * @return  void
 	 *
 	 * @since   12.3
+	 * @deprecated  4.0  Use PHP 5.5's native password hashing API
 	 */
 	public function setDefaultType($type)
 	{
@@ -177,6 +185,7 @@ public function setDefaultType($type)
 	 * @return   string  $type  The default type
 	 *
 	 * @since   12.3
+	 * @deprecated  4.0  Use PHP 5.5's native password hashing API
 	 */
 	public function getDefaultType()
 	{
diff --git a/plugins/captcha/recaptcha/recaptcha.xml b/plugins/captcha/recaptcha/recaptcha.xml
index f6f9fa746e219..d51eb08688546 100644
--- a/plugins/captcha/recaptcha/recaptcha.xml
+++ b/plugins/captcha/recaptcha/recaptcha.xml
@@ -28,8 +28,8 @@
 			label="PLG_RECAPTCHA_VERSION_LABEL"
 			description="PLG_RECAPTCHA_VERSION_DESC"
 			size="1">
-			<option value="1.0">PLG_RECAPTCHA_VERSION_1</option>
-			<option value="2.0">PLG_RECAPTCHA_VERSION_2</option>
+			<option value="1.0">PLG_RECAPTCHA_VERSION_V1</option>
+			<option value="2.0">PLG_RECAPTCHA_VERSION_V2</option>
 		</field>
 		<field
 			name="public_key"
diff --git a/plugins/system/updatenotification/updatenotification.xml b/plugins/system/updatenotification/updatenotification.xml
index a2433c902add3..a0088d1fde387 100644
--- a/plugins/system/updatenotification/updatenotification.xml
+++ b/plugins/system/updatenotification/updatenotification.xml
@@ -8,7 +8,7 @@
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>3.5.0</version>
-	<description>PLG_SYSTEM_UPDATENOTIFICATION_DESCRIPTION</description>
+	<description>PLG_SYSTEM_UPDATENOTIFICATION_XML_DESCRIPTION</description>
 	<files>
 		<filename plugin="updatenotification">updatenotification.php</filename>
 	</files>