8 files changed, 77 insertions, 0 deletions
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index afd2b94924..f1f7eee282 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -89,6 +89,8 @@ function popup(url, width, height, name)
 
 {$STYLESHEETS}
 
+<!-- EVENT acp_overall_header_stylesheets_after -->
+
 </head>
 
 <body class="{S_CONTENT_DIRECTION} {BODY_CLASS} nojs">
diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html
index bf8f41cd7a..d0b9bf62ed 100644
--- a/phpBB/adm/style/simple_header.html
+++ b/phpBB/adm/style/simple_header.html
@@ -84,6 +84,7 @@ function find_username(url)
 </script>
 <!-- EVENT acp_simple_header_head_append -->
 {$STYLESHEETS}
+<!-- EVENT acp_simple_header_stylesheets_after -->
 </head>
 
 <body class="{S_CONTENT_DIRECTION} {BODY_CLASS}">
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index b80e5fd4cb..c537504d54 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -64,6 +64,13 @@ acp_overall_header_head_append
 * Since: 3.1.0-a1
 * Purpose: Add assets within the `<head>` tags in the ACP
 
+acp_overall_header_stylesheets_after
+===
+* Location: adm/style/overall_header.html
+* Since: 3.1.0-RC3
+* Purpose: Add assets after stylesheets within the `<head>` tags in the ACP.
+Note that INCLUDECSS will not work with this event.
+
 acp_posting_buttons_after
 ===
 * Locations:
@@ -96,6 +103,13 @@ acp_simple_header_head_append
 * Since: 3.1.0-a1
 * Purpose: Add assets within the `<head>` tags in the simple header of the ACP
 
+acp_simple_header_stylesheets_after
+===
+* Location: adm/style/simple_header.html
+* Since: 3.1.0-RC3
+* Purpose: Add assets after stylesheets within the `<head>` tags in the simple header
+of the ACP. Note that INCLUDECSS will not work with this event.
+
 acp_users_overview_options_append
 ===
 * Location: adm/style/acp_users_overview.html
@@ -609,6 +623,15 @@ overall_header_page_body_before
 * Since: 3.1.0-b3
 * Purpose: Add content after the page-header, but before the page-body
 
+overall_header_stylesheets_after
+===
+* Locations:
+    + styles/prosilver/template/overall_header.html
+    + styles/subsilver2/template/overall_header.html
+* Since: 3.1.0-RC3
+* Purpose: Add asset calls after stylesheets within the `</head>` tag.
+Note that INCLUDECSS will not work with this event.
+
 posting_editor_buttons_after
 ===
 * Locations:
@@ -767,6 +790,15 @@ simple_header_head_append
 * Since: 3.1.0-b4
 * Purpose: Add asset calls directly before the `</head>` tag
 
+simple_header_stylesheets_after
+===
+* Locations:
+    + styles/prosilver/template/simple_header.html
+    + styles/subsilver2/template/simple_header.html
+* Since: 3.1.0-RC3
+* Purpose: Add asset calls after stylesheets within the `</head>` tag.
+Note that INCLUDECSS will not work with this event.
+
 topiclist_row_prepend
 ===
 * Locations:
diff --git a/phpBB/phpbb/db/migration/data/v310/search_type.php b/phpBB/phpbb/db/migration/data/v310/search_type.php
new file mode 100644
index 0000000000..f89456ae19
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v310/search_type.php
@@ -0,0 +1,34 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace phpbb\db\migration\data\v310;
+
+class search_type extends \phpbb\db\migration\migration
+{
+	static public function depends_on()
+	{
+		return array(
+			'\phpbb\db\migration\data\v310\dev',
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('if', array(
+				(is_file($this->phpbb_root_path . 'phpbb/search/' . $this->config['search_type'] . $this->php_ext)),
+				array('config.update', array('search_type', '\\phpbb\\search\\' . $this->config['search_type'])),
+			)),
+		);
+	}
+}
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index df09fc6a30..076a3160f0 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -51,6 +51,8 @@
 
 {$STYLESHEETS}
 
+<!-- EVENT overall_header_stylesheets_after -->
+
 </head>
 <body id="phpbb" class="nojs notouch section-{SCRIPT_NAME} {S_CONTENT_DIRECTION} {BODY_CLASS}">
 
diff --git a/phpBB/styles/prosilver/template/simple_header.html b/phpBB/styles/prosilver/template/simple_header.html
index d31dd32cf6..0831d5f9dc 100644
--- a/phpBB/styles/prosilver/template/simple_header.html
+++ b/phpBB/styles/prosilver/template/simple_header.html
@@ -28,6 +28,8 @@
 
 {$STYLESHEETS}
 
+<!-- EVENT simple_header_stylesheets_after -->
+
 </head>
 
 <body id="phpbb" class="nojs {S_CONTENT_DIRECTION} {BODY_CLASS}">
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index cb9a3a2a36..a87c0fcd5d 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -135,6 +135,8 @@ function marklist(id, name, state)
 
 {$STYLESHEETS}
 
+<!-- EVENT overall_header_stylesheets_after -->
+
 </head>
 <body class="{S_CONTENT_DIRECTION} {BODY_CLASS}">
 
diff --git a/phpBB/styles/subsilver2/template/simple_header.html b/phpBB/styles/subsilver2/template/simple_header.html
index faeeaea3d5..0c3dff4a05 100644
--- a/phpBB/styles/subsilver2/template/simple_header.html
+++ b/phpBB/styles/subsilver2/template/simple_header.html
@@ -14,6 +14,8 @@
 
 {$STYLESHEETS}
 
+<!-- EVENT simple_header_stylesheets_after -->
+
 </head>
 
 <body class="{S_CONTENT_DIRECTION} {BODY_CLASS}">