diff --git a/libraries/joomla/document/renderer/html/head.php b/libraries/joomla/document/renderer/html/head.php
index 3d6f747b0192a..9409d41cf4317 100644
--- a/libraries/joomla/document/renderer/html/head.php
+++ b/libraries/joomla/document/renderer/html/head.php
@@ -63,16 +63,78 @@ public function fetchHead($document)
 		$app->triggerEvent('onBeforeCompileHead');
 
 		// Get line endings
-		$lnEnd        = $document->_getLineEnd();
-		$tab          = $document->_getTab();
-		$tagEnd       = ' />';
-		$buffer       = '';
-		$mediaVersion = $document->getMediaVersion();
+		$lnEnd  = $document->_getLineEnd();
+
+		// Get the meta tags (also base, title, etc.)
+		$buffer = $this->fetchMetaTags($document);
+
+		// Get (non-stylesheet) link tags if any
+		if (!empty($document->_links))
+		{
+			$buffer = array_merge($buffer, $this->fetchLinkTags($document));
+		}
+
+		// Get the stylesheets
+		if (!empty($document->_styleSheets))
+		{
+			$buffer = array_merge($buffer, $this->fetchStyleSheets($document));
+		}
+
+		// Get the style declarations
+		if (!empty($document->_style))
+		{
+			$buffer = array_merge($buffer, $this->fetchStyleDeclarations($document));
+		}
+
+		// Get script options
+		$scriptOptions = $document->getScriptOptions();
+
+		if (!empty($scriptOptions))
+		{
+			$buffer = array_merge($buffer, $this->fetchScriptOptions($document));
+		}
+
+		// Get scripts (loaded as external files)
+		if (!empty($document->_scripts))
+		{
+			$buffer = array_merge($buffer, $this->fetchScripts($document));
+		}
+
+		// Get script declarations
+		if (!empty($document->_script))
+		{
+			$buffer = array_merge($buffer, $this->fetchScriptDeclarations($document));
+		}
+
+		// Get custom tags
+		if (!empty($document->_custom))
+		{
+			$buffer = array_merge($buffer, $this->fetchCustomTags($document));
+		}
+
+		return implode($lnEnd, $buffer);
+	}
+
+	/**
+	 * Gets the meta, title, and base tags as an array.
+	 *
+	 * @param   JDocumentHtml  $document  The document for which the head will be created
+	 *
+	 * @return  array  The tags
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected function fetchMetaTags($document)
+	{
+		$tab     = $document->_getTab();
+		$isHtml5 = $document->isHtml5();
+		$tagEnd  = $isHtml5 ? '>' : '/>';
+		$buffer  = array();
 
 		// Generate charset when using HTML5 (should happen first)
-		if ($document->isHtml5())
+		if ($isHtml5)
 		{
-			$buffer .= $tab . '<meta charset="' . $document->getCharset() . '" />' . $lnEnd;
+			$buffer[] = $tab . '<meta charset="' . $document->getCharset() . '"' . $tagEnd;
 		}
 
 		// Generate base tag (need to happen early)
@@ -80,7 +142,7 @@ public function fetchHead($document)
 
 		if (!empty($base))
 		{
-			$buffer .= $tab . '<base href="' . $base . '" />' . $lnEnd;
+			$buffer[] = $tab . '<base href="' . $base . '"' . $tagEnd;
 		}
 
 		// Generate META tags (needs to happen as early as possible in the head)
@@ -88,14 +150,13 @@ public function fetchHead($document)
 		{
 			foreach ($tag as $name => $content)
 			{
-				if ($type == 'http-equiv' && !($document->isHtml5() && $name == 'content-type'))
-				{
-					$buffer .= $tab . '<meta http-equiv="' . $name . '" content="' . htmlspecialchars($content, ENT_COMPAT, 'UTF-8') . '" />' . $lnEnd;
-				}
-				elseif ($type != 'http-equiv' && !empty($content))
+				// Html5 doesn't need content-type and we don't need empty meta tags
+				if (($isHtml5 && $type == 'http-equiv' && $name == 'content-type') || empty($content))
 				{
-					$buffer .= $tab . '<meta ' . $type . '="' . $name . '" content="' . htmlspecialchars($content, ENT_COMPAT, 'UTF-8') . '" />' . $lnEnd;
+					continue;
 				}
+
+				$buffer[] = $tab . '<meta ' . $type . '="' . $name . '" content="' . htmlspecialchars($content, ENT_COMPAT, 'UTF-8') . '"' . $tagEnd;
 			}
 		}
 
@@ -104,7 +165,7 @@ public function fetchHead($document)
 
 		if ($documentDescription)
 		{
-			$buffer .= $tab . '<meta name="description" content="' . htmlspecialchars($documentDescription, ENT_COMPAT, 'UTF-8') . '" />' . $lnEnd;
+			$buffer[] = $tab . '<meta name="description" content="' . htmlspecialchars($documentDescription, ENT_COMPAT, 'UTF-8') . '"' . $tagEnd;
 		}
 
 		// Don't add empty generators
@@ -112,146 +173,185 @@ public function fetchHead($document)
 
 		if ($generator)
 		{
-			$buffer .= $tab . '<meta name="generator" content="' . htmlspecialchars($generator, ENT_COMPAT, 'UTF-8') . '" />' . $lnEnd;
+			$buffer[] = $tab . '<meta name="generator" content="' . htmlspecialchars($generator, ENT_COMPAT, 'UTF-8') . '"' . $tagEnd;
 		}
 
-		$buffer .= $tab . '<title>' . htmlspecialchars($document->getTitle(), ENT_COMPAT, 'UTF-8') . '</title>' . $lnEnd;
+		$buffer[] = $tab . '<title>' . htmlspecialchars($document->getTitle(), ENT_COMPAT, 'UTF-8') . '</title>';
+
+		return $buffer;
+	}
+
+	/**
+	 * Gets the (non-stylesheet) link tags as an array.
+	 *
+	 * @param   JDocumentHtml  $document  The document for which the head will be created
+	 *
+	 * @return  array  The tags
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected function fetchLinkTags($document)
+	{
+		$tab     = $document->_getTab();
+		$isHtml5 = $document->isHtml5();
+		$tagEnd  = $isHtml5 ? '>' : '/>';
+		$buffer  = array();
 
 		// Generate link declarations
 		foreach ($document->_links as $link => $linkAtrr)
 		{
-			$buffer .= $tab . '<link href="' . $link . '" ' . $linkAtrr['relType'] . '="' . $linkAtrr['relation'] . '"';
+			$attr = array(
+				'href="' . $link . '"',
+				$linkAtrr['relType'] . '="' . $linkAtrr['relation'] . '"'
+			);
 
 			if (is_array($linkAtrr['attribs']))
 			{
-				if ($temp = ArrayHelper::toString($linkAtrr['attribs']))
-				{
-					$buffer .= ' ' . $temp;
-				}
+				$attr[] = ArrayHelper::toString($linkAtrr['attribs']);
 			}
 
-			$buffer .= ' />' . $lnEnd;
+			$buffer[] = $tab . '<link ' . implode(' ', $attr) . $tagEnd;
 		}
 
+		return $buffer;
+	}
+
+	/**
+	 * Gets the (stylesheet) link tags as an array.
+	 *
+	 * @param   JDocumentHtml  $document  The document for which the head will be created
+	 *
+	 * @return  array  The tags
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected function fetchStyleSheets($document)
+	{
+		$tab          = $document->_getTab();
+		$isHtml5      = $document->isHtml5();
+		$mediaVersion = $document->getMediaVersion();
+		$tagEnd       = $isHtml5 ? ' >' : ' />';
+		$buffer       = array();
+
 		$defaultCssMimes = array('text/css');
 
 		// Generate stylesheet links
 		foreach ($document->_styleSheets as $src => $attribs)
 		{
-			// Check if stylesheet uses IE conditional statements.
-			$conditional = isset($attribs['options']) && isset($attribs['options']['conditional']) ? $attribs['options']['conditional'] : null;
+			$conditional = null;
+			$attr = array('rel="stylesheet"');
 
-			// Check if script uses media version.
-			if (isset($attribs['options']['version']) && $attribs['options']['version'] && strpos($src, '?') === false
-				&& ($mediaVersion || $attribs['options']['version'] !== 'auto'))
+			if (isset($attribs['mime']) && (!$isHtml5 || !in_array($attribs['mime'], $defaultCssMimes)))
 			{
-				$src .= '?' . ($attribs['options']['version'] === 'auto' ? $mediaVersion : $attribs['options']['version']);
+				$attr[] = 'type="' . $attribs['mime'] . '"';
 			}
 
-			$buffer .= $tab;
-
-			// This is for IE conditional statements support.
-			if (!is_null($conditional))
+			if (isset($attribs['options']) && is_array($attribs['options']))
 			{
-				$buffer .= '<!--[if ' . $conditional . ']>';
-			}
-
-			$buffer .= '<link href="' . $src . '" rel="stylesheet"';
-
-			// Add script tag attributes.
-			foreach ($attribs as $attrib => $value)
-			{
-				// Don't add the 'options' attribute. This attribute is for internal use (version, conditional, etc).
-				if ($attrib === 'options')
-				{
-					continue;
-				}
+				$options = $attribs['options'];
 
-				// Don't add type attribute if document is HTML5 and it's a default mime type. 'mime' is for B/C.
-				if (in_array($attrib, array('type', 'mime')) && $document->isHtml5() && in_array($value, $defaultCssMimes))
-				{
-					continue;
-				}
+				$conditional = isset($options['conditional']) ? $options['conditional'] : null;
 
-				// Don't add type attribute if document is HTML5 and it's a default mime type. 'mime' is for B/C.
-				if ($attrib === 'mime')
+				if (isset($options['version']) && $options['version'] && strpos($src, '?') === false
+					&& ($mediaVersion || $options['version'] !== 'auto'))
 				{
-					$attrib = 'type';
+					$src .= '?' . ($options['version'] === 'auto' ? $mediaVersion : $options['version']);
 				}
-
-				// Add attribute to script tag output.
-				$buffer .= ' ' . htmlspecialchars($attrib, ENT_COMPAT, 'UTF-8');
-
-				// Json encode value if it's an array.
-				$value = !is_scalar($value) ? json_encode($value) : $value;
-
-				$buffer .= '="' . htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . '"';
 			}
 
-			$buffer .= $tagEnd;
+			$attr[] = 'href="' . $src . '"';
+
+			$buffer[] = $tab;
 
 			// This is for IE conditional statements support.
 			if (!is_null($conditional))
 			{
-				$buffer .= '<![endif]-->';
+				$attr[] = 'media="' . $attribs['media'] . '"';
+			}
+
+			if (isset($attribs['attribs']) && is_array($attribs['attribs']) && !empty($attribs['attribs']))
+			{
+				$attr[] = ArrayHelper::toString($attribs['attribs']);
 			}
 
-			$buffer .= $lnEnd;
+			$buffer[] = $tab . '<link ' . implode(' ', $attr) . $tagEnd;
 		}
 
+		return $buffer;
+	}
+
+	/**
+	 * Gets the style tags as an array.
+	 *
+	 * @param   JDocumentHtml  $document  The document for which the head will be created
+	 *
+	 * @return  array  The tags
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected function fetchStyleDeclarations($document)
+	{
+		$tab    = $document->_getTab();
+		$buffer = array();
+
+		$defaultCssMimes = array('text/css');
+
 		// Generate stylesheet declarations
 		foreach ($document->_style as $type => $content)
 		{
-			$buffer .= $tab . '<style';
+			$openTag = $tab . '<style';
 
 			if (!is_null($type) && (!$document->isHtml5() || !in_array($type, $defaultCssMimes)))
 			{
-				$buffer .= ' type="' . $type . '"';
+				$openTag .= ' type="' . $type . '"';
 			}
 
-			$buffer .= '>' . $lnEnd;
+			$openTag .= '>';
+
+			$buffer[] = $openTag;
 
 			// This is for full XHTML support.
 			if ($document->_mime != 'text/html')
 			{
-				$buffer .= $tab . $tab . '/*<![CDATA[*/' . $lnEnd;
+				$buffer[] = $tab . $tab . '/*<![CDATA[*/';
 			}
 
-			$buffer .= $content . $lnEnd;
+			$buffer[] = $content;
 
 			// See above note
 			if ($document->_mime != 'text/html')
 			{
-				$buffer .= $tab . $tab . '/*]]>*/' . $lnEnd;
+				$buffer[] = $tab . $tab . '/*]]>*/';
 			}
 
-			$buffer .= $tab . '</style>' . $lnEnd;
+			$buffer[] = $tab . '</style>';
 		}
 
-		// Generate scripts options
-		$scriptOptions = $document->getScriptOptions();
-
-		if (!empty($scriptOptions))
-		{
-			$buffer .= $tab . '<script type="application/json" class="joomla-script-options new">';
-
-			$prettyPrint = (JDEBUG && defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : false);
-			$jsonOptions = json_encode($scriptOptions, $prettyPrint);
-			$jsonOptions = $jsonOptions ? $jsonOptions : '{}';
+		return $buffer;
+	}
 
-			$buffer .= $jsonOptions;
-			$buffer .= '</script>' . $lnEnd;
-		}
+	/**
+	 * Gets the external file loading script tags as an array.
+	 *
+	 * @param   JDocumentHtml  $document  The document for which the head will be created
+	 *
+	 * @return  array  The tags
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected function fetchScripts($document)
+	{
+		$tab     = $document->_getTab();
+		$isHtml5 = $document->isHtml5();
+		$buffer  = array();
 
 		$defaultJsMimes         = array('text/javascript', 'application/javascript', 'text/x-javascript', 'application/x-javascript');
 		$html5NoValueAttributes = array('defer', 'async');
+		$mediaVersion           = $document->getMediaVersion();
 
 		// Generate script file links
 		foreach ($document->_scripts as $src => $attribs)
 		{
-			// Check if script uses IE conditional statements.
-			$conditional = isset($attribs['options']) && isset($attribs['options']['conditional']) ? $attribs['options']['conditional'] : null;
-
 			// Check if script uses media version.
 			if (isset($attribs['options']['version']) && $attribs['options']['version'] && strpos($src, '?') === false
 				&& ($mediaVersion || $attribs['options']['version'] !== 'auto'))
@@ -259,15 +359,7 @@ public function fetchHead($document)
 				$src .= '?' . ($attribs['options']['version'] === 'auto' ? $mediaVersion : $attribs['options']['version']);
 			}
 
-			$buffer .= $tab;
-
-			// This is for IE conditional statements support.
-			if (!is_null($conditional))
-			{
-				$buffer .= '<!--[if ' . $conditional . ']>';
-			}
-
-			$buffer .= '<script src="' . $src . '"';
+			$attr = array('src="' . $src . '"');
 
 			// Add script tag attributes.
 			foreach ($attribs as $attrib => $value)
@@ -302,61 +394,133 @@ public function fetchHead($document)
 				}
 
 				// Add attribute to script tag output.
-				$buffer .= ' ' . htmlspecialchars($attrib, ENT_COMPAT, 'UTF-8');
+				$attribValue = htmlspecialchars($attrib, ENT_COMPAT, 'UTF-8');
 
 				if (!($document->isHtml5() && in_array($attrib, $html5NoValueAttributes)))
 				{
 					// Json encode value if it's an array.
 					$value = !is_scalar($value) ? json_encode($value) : $value;
 
-					$buffer .= '="' . htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . '"';
+					$attribValue .= '="' . htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . '"';
 				}
+
+				$attr[] = $attribValue;
 			}
 
-			$buffer .= '></script>';
+			// Check if script uses IE conditional statements.
+			$conditional = isset($attribs['options']) && isset($attribs['options']['conditional']) ? $attribs['options']['conditional'] : null;
 
-			// This is for IE conditional statements support.
-			if (!is_null($conditional))
-			{
-				$buffer .= '<![endif]-->';
-			}
+			$buffer[] = $tab .
+				(is_null($conditional) ? '' : '<!--[if ' . $conditional . ']>') .
+				'<script ' . implode(' ', $attr) . '></script>' .
+				(is_null($conditional) ? '' : '<![endif]-->');
+		}
+
+		return $buffer;
+	}
 
-			$buffer .= $lnEnd;
+	/**
+	 * Gets a script tag containing the Joomla options storage.
+	 *
+	 * @param   JDocumentHtml  $document  The document for which the head will be created
+	 *
+	 * @return  array  The tags
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected function fetchScriptOptions($document)
+	{
+		// Generate scripts options
+		$scriptOptions = $document->getScriptOptions();
+
+		if (empty($scriptOptions))
+		{
+			return array();
 		}
 
+		$tab     = $document->_getTab();
+
+		$prettyPrint  = (JDEBUG && defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : false);
+		$jsonOptions = json_encode($scriptOptions, $prettyPrint);
+		$jsonOptions = $jsonOptions ? $jsonOptions : '{}';
+
+		$buffer = $tab .
+			'<script type="application/json" class="joomla-script-options new">' .
+			$jsonOptions .
+			'</script>';
+
+		return array($buffer);
+	}
+
+	/**
+	 * Gets a script tag containing javascript declarations as an array.
+	 *
+	 * @param   JDocumentHtml  $document  The document for which the head will be created
+	 *
+	 * @return  array  The tags
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected function fetchScriptDeclarations($document)
+	{
+		$tab     = $document->_getTab();
+		$isHtml5 = $document->isHtml5();
+		$buffer  = array();
+
+		$defaultJsMimes = array('text/javascript', 'application/javascript', 'text/x-javascript', 'application/x-javascript');
+
 		// Generate script declarations
 		foreach ($document->_script as $type => $content)
 		{
-			$buffer .= $tab . '<script';
+			$openTag = $tab . '<script';
 
-			if (!is_null($type) && (!$document->isHtml5() || !in_array($type, $defaultJsMimes)))
+			if (!is_null($type) && (!$isHtml5 || !in_array($type, $defaultJsMimes)))
 			{
-				$buffer .= ' type="' . $type . '"';
+				$openTag .= ' type="' . $type . '"';
 			}
 
-			$buffer .= '>' . $lnEnd;
+			$openTag .= '>';
+
+			$buffer[] = $openTag;
 
 			// This is for full XHTML support.
 			if ($document->_mime != 'text/html')
 			{
-				$buffer .= $tab . $tab . '//<![CDATA[' . $lnEnd;
+				$buffer[] = $tab . $tab . '//<![CDATA[';
 			}
 
-			$buffer .= $content . $lnEnd;
+			$buffer[] = $content;
 
 			// See above note
 			if ($document->_mime != 'text/html')
 			{
-				$buffer .= $tab . $tab . '//]]>' . $lnEnd;
+				$buffer[] = $tab . $tab . '//]]>';
 			}
 
-			$buffer .= $tab . '</script>' . $lnEnd;
+			$buffer[] = $tab . '</script>';
 		}
 
+		return $buffer;
+	}
+
+	/**
+	 * Gets the custom tags as an array.
+	 *
+	 * @param   JDocumentHtml  $document  The document for which the head will be created
+	 *
+	 * @return  array  The tags
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected function fetchCustomTags($document)
+	{
+		$tab     = $document->_getTab();
+		$buffer = array();
+
 		// Output the custom tags - array_unique makes sure that we don't output the same tags twice
 		foreach (array_unique($document->_custom) as $custom)
 		{
-			$buffer .= $tab . $custom . $lnEnd;
+			$buffer[] = $tab . $custom;
 		}
 
 		return ltrim($buffer, $tab);