Merge branch 'master' into next

# Conflicts:
#	wcfsetup/install/files/js/WCF.Combined.min.js

diff --cc wcfsetup/install/files/lib/data/comment/StructuredComment.class.php
index 13871bb93673c848880061c98a88fb81f87e25cc,1b3f5ab729f662d116c21ef459eb72ed947c10d5..fd2cc566728e35c19261c533c47602d069d0c3d4
--- 1/wcfsetup/install/files/lib/data/comment/StructuredComment.class.php
--- 2/wcfsetup/install/files/lib/data/comment/StructuredComment.class.php
+++ b/wcfsetup/install/files/lib/data/comment/StructuredComment.class.php
@@@ -167,10 -160,10 +167,10 @@@ class StructuredComment extends Databas
        }
        
        /**
 -       * @see \Iterator::key()
 +       * @inheritDoc
         */
        public function key() {
-               return $this->postition;
+               return $this->position;
        }
        
        /**