Merge branch '4.2' into 4

docs/en/02_Developer_Guides/01_Templates/How_Tos/02_Pagination.md

@@ -63,7 +63,7 @@ switch between pages:
                 ...
             <% end_if %>
         <% end_if %>
-        <% end_loop %>
+    <% end_loop %>
     <% if $PaginatedPages.NotLastPage %>
         <a class="next" href="$PaginatedPages.NextLink">Next</a>
     <% end_if %>

templates/SilverStripe/Security/Security_MultiAuthenticatorTabbedForms.ss

@@ -1,12 +1,12 @@
 <ul>
 	<% loop $Forms %>
 	<li>
-		<a href="#{$FormName}">$AuthenticatorName</a>
+		<a href="#{$FormName}_Tab">$AuthenticatorName</a>
 	</li>
 	<% end_loop %>
 </ul>
 <% loop $Forms %>
-<div class="form-tab" id="{$FormName}">
+<div class="form-tab" id="{$FormName}_Tab">
 	<h3>$AuthenticatorName</h3>
 	$forTemplate
 </div>