Merge branch '3.1.x' into 3.2.x

Conflicts:
	phpBB/styles/subsilver2/template/memberlist_email.html

phpBB/docs/events.md

@@ -909,6 +909,13 @@ memberlist_body_username_prepend
 * Purpose: Add information before every username in the memberlist. Works in
 all display modes (leader, group and normal memberlist).
 
+memberlist_email_before
+===
+* Locations:
+    + styles/prosilver/template/memberlist_email.html
+* Since: 3.1.10-RC1
+* Purpose: Allow adding customizations before the memberlist_email form.
+
 memberlist_search_fields_after
 ===
 * Locations:

phpBB/styles/prosilver/template/memberlist_email.html

@@ -1,5 +1,7 @@
 <!-- INCLUDE overall_header.html -->
 
+<!-- EVENT memberlist_email_before -->
+
 <!-- IF S_CONTACT_ADMIN-->
 <h2 class="titlespace">{L_CONTACT_ADMIN}</h2>
 <!-- ELSEIF S_SEND_USER -->