diff --git a/administrator/templates/atum/index.php b/administrator/templates/atum/index.php
index 2bc02e1ea28..37a45e5ecee 100644
--- a/administrator/templates/atum/index.php
+++ b/administrator/templates/atum/index.php
@@ -42,10 +42,10 @@ require_once __DIR__ . '/Service/HTML/Atum.php';
 
 // Template params
 $siteLogo  = $this->params->get('siteLogo')
-	? Uri::root() . $this->params->get('siteLogo')
+	? Uri::root() . htmlspecialchars($this->params->get('siteLogo'), ENT_QUOTES)
 	: $this->baseurl . '/templates/' . $this->template . '/images/logo-joomla-blue.svg';
 $smallLogo = $this->params->get('smallLogo')
-	? Uri::root() . $this->params->get('smallLogo')
+	? Uri::root() . htmlspecialchars($this->params->get('smallLogo'), ENT_QUOTES)
 	: $this->baseurl . '/templates/' . $this->template . '/images/logo-blue.svg';
 
 $logoAlt = htmlspecialchars($this->params->get('altSiteLogo', ''), ENT_COMPAT, 'UTF-8');
diff --git a/administrator/templates/atum/login.php b/administrator/templates/atum/login.php
index 1f5f9c3bd6f..44d77ac4a0e 100644
--- a/administrator/templates/atum/login.php
+++ b/administrator/templates/atum/login.php
@@ -35,13 +35,13 @@ require_once __DIR__ . '/Service/HTML/Atum.php';
 
 // Template params
 $siteLogo  = $this->params->get('siteLogo')
-	? Uri::root() . $this->params->get('siteLogo')
+	? Uri::root() . htmlspecialchars($this->params->get('siteLogo'), ENT_QUOTES)
 	: $this->baseurl . '/templates/' . $this->template . '/images/logo-joomla-blue.svg';
 $loginLogo = $this->params->get('loginLogo')
 	? Uri::root() . $this->params->get('loginLogo')
 	: $this->baseurl . '/templates/' . $this->template . '/images/logo-blue.svg';
 $smallLogo = $this->params->get('smallLogo')
-	? Uri::root() . $this->params->get('smallLogo')
+	? Uri::root() . htmlspecialchars($this->params->get('smallLogo'), ENT_QUOTES)
 	: $this->baseurl . '/templates/' . $this->template . '/images/logo-blue.svg';
 
 $logoAlt = htmlspecialchars($this->params->get('altSiteLogo', ''), ENT_COMPAT, 'UTF-8');
diff --git a/cli/finder_indexer.php b/cli/finder_indexer.php
index 1b7cbb13ba9..4d58635e70f 100644
--- a/cli/finder_indexer.php
+++ b/cli/finder_indexer.php
@@ -14,7 +14,7 @@
  * Called with no arguments: php finder_indexer.php
  *                           Performs an incremental update of the index using dynamic pausing.
  *
- * IMPORTANT NOTE:  since Joomla version __DEPLOY_VERSION__ the default behavior of this script has changed.
+ * IMPORTANT NOTE:  since Joomla version 3.9.12 the default behavior of this script has changed.
  *                  If called with no arguments, the `--pause` argument is silently applied, in order to avoid the possibility of
  *                  stressing the server too much and making a site (or multiple sites, if on a shared environment) unresponsive.
  *                  If a pause is unwanted, just apply `--pause=0` to the command
@@ -109,7 +109,7 @@ class FinderCli extends \Joomla\CMS\Application\CliApplication
 	 * Defaults to 'division'
 	 *
 	 * @var    string|integer
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.9.12
 	 */
 	private $pause = 'division';
 
@@ -120,7 +120,7 @@ class FinderCli extends \Joomla\CMS\Application\CliApplication
 	 * Defaults to 5
 	 *
 	 * @var    integer
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.9.12
 	 */
 	private $divisor = 5;
 
@@ -129,7 +129,7 @@ class FinderCli extends \Joomla\CMS\Application\CliApplication
 	 * Defaults to 1
 	 *
 	 * @var    integer
-	 * @since  __DEPLOY_VERSION__
+	 * @since  3.9.12
 	 */
 	private $minimumBatchProcessingTime = 1;
 
diff --git a/installation/language/en-US/en-US.ini b/installation/language/en-US/en-US.ini
index 8c311fbf5f7..ed02e0aa75f 100644
--- a/installation/language/en-US/en-US.ini
+++ b/installation/language/en-US/en-US.ini
@@ -145,6 +145,7 @@ INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_MODULESWHITCHER_LANGUAGECODE="Joomla was
 INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGECODE="Joomla was unable to automatically enable the Language Code Plugin."
 INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGEFILTER="Joomla was unable to automatically enable the Language Filter Plugin."
 INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="Joomla was unable to install %s language."
+INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_MULTILANG="Joomla was unable to install the multilingual sample data as only one language is installed. To activate the multilingual feature, you need to install more languages, press the 'Previous' button and choose the desired languages from the list."
 INSTL_DEFAULTLANGUAGE_COULD_NOT_PUBLISH_MOD_MULTILANGSTATUS="Joomla was unable to automatically publish the language status module."
 INSTL_DEFAULTLANGUAGE_COULD_NOT_UNPUBLISH_MOD_DEFAULTMENU="Joomla was unable to automatically unpublish the default menu module."
 INSTL_DEFAULTLANGUAGE_DESC="Joomla has installed the following languages. Please select your desired default language for the Joomla Administrator."
diff --git a/installation/language/en-US/en-US.xml b/installation/language/en-US/en-US.xml
index a1227a469f6..a19cae5a344 100644
--- a/installation/language/en-US/en-US.xml
+++ b/installation/language/en-US/en-US.xml
@@ -3,8 +3,8 @@
 	version="3.9"
 	client="installation">
 	<name>English (United States)</name>
-	<version>3.9.0</version>
-	<creationDate>October 2018</creationDate>
+	<version>3.9.12</version>
+	<creationDate>September 2019</creationDate>
 	<author>Joomla! Project</author>
 	<copyright>Copyright (C) 2005 - 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
@@ -12,7 +12,7 @@
 		<filename>en-US.ini</filename>
 	</files>
 	<metadata>
-		<name>English (US)</name>
+		<name>English (en_US)</name>
 		<nativeName>English (United States)</nativeName>
 		<tag>en-US</tag>
 		<rtl>0</rtl>
diff --git a/plugins/content/joomla/joomla.php b/plugins/content/joomla/joomla.php
index c16a37dcef2..8813bd30755 100644
--- a/plugins/content/joomla/joomla.php
+++ b/plugins/content/joomla/joomla.php
@@ -722,7 +722,7 @@ class PlgContentJoomla extends CMSPlugin
 	*
 	* @return  void
 	*
-	* @since   __DEPLOY_VERSION__
+	* @since   3.9.12
 	*/
 	public function onContentBeforeSave($context, $table, $isNew)
 	{
diff --git a/plugins/system/cache/cache.php b/plugins/system/cache/cache.php
index b8c580a4300..090d57ac717 100644
--- a/plugins/system/cache/cache.php
+++ b/plugins/system/cache/cache.php
@@ -157,7 +157,7 @@ class PlgSystemCache extends CMSPlugin
 	 *
 	 * @return   void
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since   3.9.12
 	 */
 	public function onAfterRender()
 	{
diff --git a/templates/cassiopeia/index.php b/templates/cassiopeia/index.php
index ea3899a23d1..c7095bd4f2a 100644
--- a/templates/cassiopeia/index.php
+++ b/templates/cassiopeia/index.php
@@ -39,7 +39,7 @@ HTMLHelper::_('stylesheet', 'language/' . $lang->getTag() . '/' . $lang->getTag(
 // Logo file or site title param
 if ($this->params->get('logoFile'))
 {
-	$logo = '<img src="' . Uri::root() . $this->params->get('logoFile') . '" alt="' . $sitename . '">';
+	$logo = '<img src="' . Uri::root() . htmlspecialchars($this->params->get('logoFile'), ENT_QUOTES) . '" alt="' . $sitename . '">';
 }
 elseif ($this->params->get('siteTitle'))
 {