Merge branch '3.1' into 5.2

diff --cc com.woltlab.wcf/page.xml
index b88aaa33ec053c5cf6cf8114d55b99d236ea3331,e3689f840504469c2ff002efe3d5c7e0f1c83039..e9668807d60bcbd75943b9670c6a4c5babb45f57
--- 1/com.woltlab.wcf/page.xml
--- 2/com.woltlab.wcf/page.xml
+++ b/com.woltlab.wcf/page.xml
@@@ -584,9 -544,11 +584,9 @@@
                <page identifier="com.woltlab.wcf.Contact">
                        <pageType>system</pageType>
                        <controller>wcf\form\ContactForm</controller>
-                       <name language="de">Kontakt-Formular</name>
+                       <name language="de">Kontaktformular</name>
                        <name language="en">Contact Form</name>
                        <options>module_contact_form</options>
 -                      <allowSpidersToIndex>0</allowSpidersToIndex>
 -                      
                        <content language="en">
                                <title>Contact</title>
                        </content>