Merge remote-tracking branch 'refs/remotes/origin/3.0'

# Conflicts:
#	com.woltlab.wcf/option.xml

diff --cc com.woltlab.wcf/option.xml
index 41625adaf91f85f22741f3254e1d09dab42972b2,ea09edbdd8fd17c71b8893f90d8451765fc77229..d412a78eceefc1c03053453cb67e8f977e494580
--- 1/com.woltlab.wcf/option.xml
--- 2/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@@ -610,8 -539,8 +610,8 @@@ private:wcf.acp.option.exception_privac
                        <option name="cookie_prefix">
                                <categoryname>general.system.cookie</categoryname>
                                <optiontype>text</optiontype>
 -                              <defaultvalue>wsc30_</defaultvalue>
 +                              <defaultvalue>wsc31_</defaultvalue>
-                               <validationpattern>.+</validationpattern>
+                               <validationpattern>^[a-zA-Z0-9_]+$</validationpattern>
                        </option>
                        <!-- /general.system.cookie-->