Merge branch '3.1.x'

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

phpBB/docs/events.md

@@ -1737,6 +1737,20 @@ viewtopic_body_footer_before
 * Purpose: Add content to the bottom of the View topic screen below the posts
 and quick reply, directly before the jumpbox in Prosilver.
 
+viewtopic_body_poll_after
+===
+* Locations:
+    + styles/prosilver/template/viewtopic_body.html
+* Since: 3.1.6-RC1
+* Purpose: Add content after the poll panel.
+
+viewtopic_body_poll_before
+===
+* Locations:
+    + styles/prosilver/template/viewtopic_body.html
+* Since: 3.1.6-RC1
+* Purpose: Add content before the poll panel.
+
 viewtopic_body_poll_option_after
 ===
 * Locations:

phpBB/styles/prosilver/template/viewtopic_body.html

@@ -68,6 +68,8 @@
 	<!-- EVENT viewtopic_body_pagination_top_after -->
 </div>
 
+<!-- EVENT viewtopic_body_poll_before -->
+
 <!-- IF S_HAS_POLL -->
 	<form method="post" action="{S_POLL_ACTION}" data-ajax="vote_poll" class="topic_poll">
 
@@ -121,6 +123,8 @@
 	<hr />
 <!-- ENDIF -->
 
+<!-- EVENT viewtopic_body_poll_after -->
+
 <!-- BEGIN postrow -->
 	<!-- EVENT viewtopic_body_postrow_post_before -->
 	<!-- IF postrow.S_FIRST_UNREAD -->