Merge branch 'master' into next

diff --cc com.woltlab.wcf/option.xml
Simple merge

diff --cc com.woltlab.wcf/userGroupOption.xml
index fa01ce47ce9ae47bf0f4385ac62eafdd072a0e49,339d220fae62e87463997cdb89aa0b68e0c09e4e..46907112b721f09f36111d1c5705a30f7bf424d1
--- 1/com.woltlab.wcf/userGroupOption.xml
--- 2/com.woltlab.wcf/userGroupOption.xml
+++ b/com.woltlab.wcf/userGroupOption.xml
@@@ -847,12 -836,8 +850,13 @@@ png</defaultvalue
                                <categoryname>user.profileComment</categoryname>
                                <optiontype>boolean</optiontype>
                                <defaultvalue>1</defaultvalue>
+                               <options>module_user_profile_wall</options>
                        </option>
 +                      <option name="user.profileComment.canAddCommentWithoutModeration">
 +                              <categoryname>user.profileComment</categoryname>
 +                              <optiontype>boolean</optiontype>
 +                              <defaultvalue>1</defaultvalue>
 +                      </option>
                        <option name="user.profileComment.canEditComment">
                                <categoryname>user.profileComment</categoryname>
                                <optiontype>boolean</optiontype>