Merge branch '5.2'

diff --cc wcfsetup/install/files/lib/system/form/builder/container/SuffixFormFieldContainer.class.php
index b3ec316a21065cf5d7abf86c8af5a0fd3dc577dd,419ec8c8c458446bd91c527af53189247cc0f525..71b680dcf0eaf4f8bbaef93b0901a90f534f5739
--- 1/wcfsetup/install/files/lib/system/form/builder/container/SuffixFormFieldContainer.class.php
--- 2/wcfsetup/install/files/lib/system/form/builder/container/SuffixFormFieldContainer.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/container/SuffixFormFieldContainer.class.php
@@@ -70,9 -70,9 +70,9 @@@ class SuffixFormFieldContainer extends 
        }
        
        /**
 -       * Returns the intial option of the suffix selection dropdown.
 +       * Returns the initial option of the suffix selection dropdown.
         * 
-        * @return      string
+        * @return      array
         * @throws      \BadMethodCallException         if no suffix field is set or has no options
         */
        public function getSelectedSuffixOption() {