Merge remote-tracking branch 'origin/1.11.x' into 1.11.x

src/Chamilo/CourseBundle/Entity/CQuizQuestion.php

@@ -365,4 +365,13 @@ class CQuizQuestion
     {
         return $this->cId;
     }
+
+    /**
+     * Get iid
+     * @return int
+     */
+    public function getIid()
+    {
+        return $this->iid;
+    }
 }