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

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

diff --cc com.woltlab.wcf/userGroupOption.xml
index 4c45bea130d55253126a9c043fd18b4e920bb0c7,b44f89f02093b2aedc09644596cafd4abc2b385b..6324f1a0644c6a211395ebad52d5160898aa802c
--- 1/com.woltlab.wcf/userGroupOption.xml
--- 2/com.woltlab.wcf/userGroupOption.xml
+++ b/com.woltlab.wcf/userGroupOption.xml
@@@ -821,14 -727,7 +825,16 @@@ png</defaultvalue
                                <categoryname>user.article</categoryname>
                                <optiontype>boolean</optiontype>
                                <defaultvalue>1</defaultvalue>
 +                              <enableoptions>user.article.canAddCommentWithoutModeration</enableoptions>
 +                              <excludedInTinyBuild>1</excludedInTinyBuild>
++                              <options>module_article</options>
 +                      </option>
 +                      <option name="user.article.canAddCommentWithoutModeration">
 +                              <categoryname>user.article</categoryname>
 +                              <optiontype>boolean</optiontype>
 +                              <defaultvalue>1</defaultvalue>
 +                              <excludedInTinyBuild>1</excludedInTinyBuild>
+                               <options>module_article</options>
                        </option>
                        <option name="user.article.canEditComment">
                                <categoryname>user.article</categoryname>