diff --git a/lang/en_utf8/quiz.php b/lang/en_utf8/quiz.php
index 27a839b..bc724c0 100644
--- a/lang/en_utf8/quiz.php
+++ b/lang/en_utf8/quiz.php
@@ -33,6 +33,7 @@ $string['addtoquiz'] = 'Add to quiz';
 $string['affectedstudents'] = 'Affected $a';
 $string['aiken'] = 'Aiken format';
 $string['allattempts'] = 'All attempts';
+$string['allanswers'] = 'Feeback for all answers';
 $string['allinone'] = 'Unlimited';
 $string['allowreview'] = 'Allow review';
 $string['alreadysubmitted'] = 'It is likely that you have already submitted this attempt';
diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php
index ce3b62f..1be5da1 100644
--- a/mod/quiz/lib.php
+++ b/mod/quiz/lib.php
@@ -46,7 +46,8 @@ define('QUIZ_REVIEW_ANSWERS',         8*0x1041); // Show correct answers
 define('QUIZ_REVIEW_SOLUTIONS',      16*0x1041); // Show solutions
 define('QUIZ_REVIEW_GENERALFEEDBACK',32*0x1041); // Show question general feedback
 define('QUIZ_REVIEW_OVERALLFEEDBACK', 1*0x4440000); // Show quiz overall feedback
-// Multipliers 2*0x4440000, 4*0x4440000 and 8*0x4440000 are still available
+define('QUIZ_REVIEW_FEEDBACK_ALLANSWERS', 2*0x4440000); // Show feedback for all answers
+// Multipliers 4*0x4440000 and 8*0x4440000 are still available
 /**#@-*/
 
 /**
@@ -845,6 +846,20 @@ function quiz_process_options(&$quiz) {
         unset($quiz->overallfeedbackclosed);
     }
 
+    if (isset($quiz->feedbackallanswersimmediately)) {
+        $review += (QUIZ_REVIEW_FEEDBACK_ALLANSWERS & QUIZ_REVIEW_IMMEDIATELY);
+        unset($quiz->feedbackallanswersimmediately);
+    }
+    if (isset($quiz->feedbackallanswersopen)) {
+        $review += (QUIZ_REVIEW_FEEDBACK_ALLANSWERS & QUIZ_REVIEW_OPEN);
+        unset($quiz->feedbackallanswersopen);
+    }
+    if (isset($quiz->feedbackallanswersclosed)) {
+        $review += (QUIZ_REVIEW_FEEDBACK_ALLANSWERS & QUIZ_REVIEW_CLOSED);
+        unset($quiz->feedbackallanswersclosed);
+    }
+
+
     $quiz->review = $review;
 }
 
diff --git a/mod/quiz/locallib.php b/mod/quiz/locallib.php
index 6a8ace7..584b7f7 100644
--- a/mod/quiz/locallib.php
+++ b/mod/quiz/locallib.php
@@ -657,6 +657,9 @@ function quiz_get_renderoptions($reviewoptions, $state) {
     // Show feedback once the question has been graded (if allowed by the quiz)
     $options->feedback = question_state_is_graded($state) && ($reviewoptions & QUIZ_REVIEW_FEEDBACK & QUIZ_REVIEW_IMMEDIATELY);
 
+    // Show feedback for all question optons once the question has been graded (if allowed by the quiz)
+    $options->feedbackallanswers = question_state_is_graded($state) && ($reviewoptions & QUIZ_REVIEW_FEEDBACK_ALLANSWERS & QUIZ_REVIEW_IMMEDIATELY);
+
     // Show validation only after a validation event
     $options->validation = QUESTION_EVENTVALIDATE === $state->event;
 
@@ -707,6 +710,7 @@ function quiz_get_reviewoptions($quiz, $attempt, $context=null) {
         $options->responses = true;
         $options->scores = true; 
         $options->feedback = true;
+        $options->feedbackallanswers = true;
         $options->correct_responses = true;
         $options->solutions = false;
         $options->generalfeedback = true;
@@ -729,12 +733,12 @@ function quiz_get_reviewoptions($quiz, $attempt, $context=null) {
         $options->responses = ($quiz->review & $quiz_state_mask & QUIZ_REVIEW_RESPONSES) ? 1 : 0;
         $options->scores = ($quiz->review & $quiz_state_mask & QUIZ_REVIEW_SCORES) ? 1 : 0;
         $options->feedback = ($quiz->review & $quiz_state_mask & QUIZ_REVIEW_FEEDBACK) ? 1 : 0;
+        $options->feedbackallanswers = ($quiz->review & $quiz_state_mask & QUIZ_REVIEW_FEEDBACK_ALLANSWERS) ? 1 : 0;
         $options->correct_responses = ($quiz->review & $quiz_state_mask & QUIZ_REVIEW_ANSWERS) ? 1 : 0;
         $options->solutions = ($quiz->review & $quiz_state_mask & QUIZ_REVIEW_SOLUTIONS) ? 1 : 0;
         $options->generalfeedback = ($quiz->review & $quiz_state_mask & QUIZ_REVIEW_GENERALFEEDBACK) ? 1 : 0;
         $options->overallfeedback = $attempt->timefinish && ($quiz->review & $quiz_state_mask & QUIZ_REVIEW_OVERALLFEEDBACK);
     }
-
     return $options;
 }
 
diff --git a/mod/quiz/mod_form.php b/mod/quiz/mod_form.php
index 2ab07c0..ff37017 100644
--- a/mod/quiz/mod_form.php
+++ b/mod/quiz/mod_form.php
@@ -153,6 +153,7 @@ class mod_quiz_mod_form extends moodleform_mod {
         $immediatelyoptionsgrp[] = &$mform->createElement('checkbox', 'responsesimmediately', '', get_string('responses', 'quiz'));
         $immediatelyoptionsgrp[] = &$mform->createElement('checkbox', 'answersimmediately', '', get_string('answers', 'quiz'));
         $immediatelyoptionsgrp[] = &$mform->createElement('checkbox', 'feedbackimmediately', '', get_string('feedback', 'quiz'));
+        $immediatelyoptionsgrp[] = &$mform->createElement('checkbox', 'feedbackallanswersimmediately', '', get_string('allanswers', 'quiz'));
         $immediatelyoptionsgrp[] = &$mform->createElement('checkbox', 'generalfeedbackimmediately', '', get_string('generalfeedback', 'quiz'));
         $immediatelyoptionsgrp[] = &$mform->createElement('checkbox', 'scoreimmediately', '', get_string('scores', 'quiz'));
         $immediatelyoptionsgrp[] = &$mform->createElement('checkbox', 'overallfeedbackimmediately', '', get_string('overallfeedback', 'quiz'));
@@ -163,11 +164,13 @@ class mod_quiz_mod_form extends moodleform_mod {
         $mform->setDefault('generalfeedbackimmediately', $CFG->quiz_review & QUIZ_REVIEW_GENERALFEEDBACK & QUIZ_REVIEW_IMMEDIATELY);
         $mform->setDefault('scoreimmediately', $CFG->quiz_review & QUIZ_REVIEW_SCORES & QUIZ_REVIEW_IMMEDIATELY);
         $mform->setDefault('overallfeedbackimmediately', $CFG->quiz_review & QUIZ_REVIEW_OVERALLFEEDBACK & QUIZ_REVIEW_IMMEDIATELY);
+        $mform->setDefault('feedbackallanswersimmediately', $CFG->quiz_review & QUIZ_REVIEW_FEEDBACK_ALLANSWERS & QUIZ_REVIEW_IMMEDIATELY);
 
         $openoptionsgrp=array();
         $openoptionsgrp[] = &$mform->createElement('checkbox', 'responsesopen', '', get_string('responses', 'quiz'));
         $openoptionsgrp[] = &$mform->createElement('checkbox', 'answersopen', '', get_string('answers', 'quiz'));
         $openoptionsgrp[] = &$mform->createElement('checkbox', 'feedbackopen', '', get_string('feedback', 'quiz'));
+        $openoptionsgrp[] = &$mform->createElement('checkbox', 'feedbackallanswersopen', '', get_string('allanswers', 'quiz'));
         $openoptionsgrp[] = &$mform->createElement('checkbox', 'generalfeedbackopen', '', get_string('generalfeedback', 'quiz'));
         $openoptionsgrp[] = &$mform->createElement('checkbox', 'scoreopen', '', get_string('scores', 'quiz'));
         $openoptionsgrp[] = &$mform->createElement('checkbox', 'overallfeedbackopen', '', get_string('overallfeedback', 'quiz'));
@@ -178,12 +181,13 @@ class mod_quiz_mod_form extends moodleform_mod {
         $mform->setDefault('generalfeedbackopen', $CFG->quiz_review & QUIZ_REVIEW_GENERALFEEDBACK & QUIZ_REVIEW_OPEN);
         $mform->setDefault('scoreopen', $CFG->quiz_review & QUIZ_REVIEW_SCORES & QUIZ_REVIEW_OPEN);
         $mform->setDefault('overallfeedbackopen', $CFG->quiz_review & QUIZ_REVIEW_OVERALLFEEDBACK & QUIZ_REVIEW_OPEN);
-
+        $mform->setDefault('feedbackallanswersopen', $CFG->quiz_review & QUIZ_REVIEW_FEEDBACK_ALLANSWERS & QUIZ_REVIEW_OPEN);
 
         $closedoptionsgrp=array();
         $closedoptionsgrp[] = &$mform->createElement('checkbox', 'responsesclosed', '', get_string('responses', 'quiz'));
         $closedoptionsgrp[] = &$mform->createElement('checkbox', 'answersclosed', '', get_string('answers', 'quiz'));
         $closedoptionsgrp[] = &$mform->createElement('checkbox', 'feedbackclosed', '', get_string('feedback', 'quiz'));
+        $closedoptionsgrp[] = &$mform->createElement('checkbox', 'feedbackallanswersclosed', '', get_string('allanswers', 'quiz'));
         $closedoptionsgrp[] = &$mform->createElement('checkbox', 'generalfeedbackclosed', '', get_string('generalfeedback', 'quiz'));
         $closedoptionsgrp[] = &$mform->createElement('checkbox', 'scoreclosed', '', get_string('scores', 'quiz'));
         $closedoptionsgrp[] = &$mform->createElement('checkbox', 'overallfeedbackclosed', '', get_string('overallfeedback', 'quiz'));
@@ -194,6 +198,7 @@ class mod_quiz_mod_form extends moodleform_mod {
         $mform->setDefault('generalfeedbackclosed', $CFG->quiz_review & QUIZ_REVIEW_GENERALFEEDBACK & QUIZ_REVIEW_CLOSED);
         $mform->setDefault('scoreclosed', $CFG->quiz_review & QUIZ_REVIEW_SCORES & QUIZ_REVIEW_CLOSED);
         $mform->setDefault('overallfeedbackclosed', $CFG->quiz_review & QUIZ_REVIEW_OVERALLFEEDBACK & QUIZ_REVIEW_CLOSED);
+        $mform->setDefault('feedbackallanswersclosed', $CFG->quiz_review & QUIZ_REVIEW_FEEDBACK_ALLANSWERS & QUIZ_REVIEW_CLOSED);
 
 //-------------------------------------------------------------------------------
         $mform->addElement('header', 'security', get_string('security', 'form'));
@@ -283,6 +288,7 @@ class mod_quiz_mod_form extends moodleform_mod {
             $default_values['generalfeedbackimmediately'] = $review & QUIZ_REVIEW_GENERALFEEDBACK & QUIZ_REVIEW_IMMEDIATELY;
             $default_values['scoreimmediately'] = $review & QUIZ_REVIEW_SCORES & QUIZ_REVIEW_IMMEDIATELY;
             $default_values['overallfeedbackimmediately'] = $review & QUIZ_REVIEW_OVERALLFEEDBACK & QUIZ_REVIEW_IMMEDIATELY;
+            $default_values['feedbackallanswersimmediately'] = $review & QUIZ_REVIEW_FEEDBACK_ALLANSWERS & QUIZ_REVIEW_IMMEDIATELY;
 
             $default_values['responsesopen'] = $review & QUIZ_REVIEW_RESPONSES & QUIZ_REVIEW_OPEN;
             $default_values['answersopen'] = $review & QUIZ_REVIEW_ANSWERS & QUIZ_REVIEW_OPEN;
@@ -290,6 +296,7 @@ class mod_quiz_mod_form extends moodleform_mod {
             $default_values['generalfeedbackopen'] = $review & QUIZ_REVIEW_GENERALFEEDBACK & QUIZ_REVIEW_OPEN;
             $default_values['scoreopen'] = $review & QUIZ_REVIEW_SCORES & QUIZ_REVIEW_OPEN;
             $default_values['overallfeedbackopen'] = $review & QUIZ_REVIEW_OVERALLFEEDBACK & QUIZ_REVIEW_OPEN;
+            $default_values['feedbackallanswersopen'] = $review & QUIZ_REVIEW_FEEDBACK_ALLANSWERS & QUIZ_REVIEW_OPEN;
 
             $default_values['responsesclosed'] = $review & QUIZ_REVIEW_RESPONSES & QUIZ_REVIEW_CLOSED;
             $default_values['answersclosed'] = $review & QUIZ_REVIEW_ANSWERS & QUIZ_REVIEW_CLOSED;
@@ -297,6 +304,7 @@ class mod_quiz_mod_form extends moodleform_mod {
             $default_values['generalfeedbackclosed'] = $review & QUIZ_REVIEW_GENERALFEEDBACK & QUIZ_REVIEW_CLOSED;
             $default_values['scoreclosed'] = $review & QUIZ_REVIEW_SCORES & QUIZ_REVIEW_CLOSED;
             $default_values['overallfeedbackclosed'] = $review & QUIZ_REVIEW_OVERALLFEEDBACK & QUIZ_REVIEW_CLOSED;
+            $default_values['feedbackallanswersclosed'] = $review & QUIZ_REVIEW_FEEDBACK_ALLANSWERS & QUIZ_REVIEW_CLOSED;
         }
 
         if (isset($default_values['optionflags'])){
diff --git a/mod/quiz/reviewoptions.html b/mod/quiz/reviewoptions.html
index 48ce800..072f7a4 100644
--- a/mod/quiz/reviewoptions.html
+++ b/mod/quiz/reviewoptions.html
@@ -13,6 +13,7 @@
     <tr valign="top">
       <td align="center"><?php print_string('responses', 'quiz') ?></td>
       <td align="center"><?php print_string('answers', 'quiz') ?></td>
+      <td align="center"><?php print_string('allanswers', 'quiz') ?></td>
       <td align="center"><?php print_string('feedback', 'quiz') ?></td>
       <td align="center"><?php print_string('generalfeedback', 'quiz') ?></td>
       <td align="center"><?php print_string('scores', 'quiz') ?></td>
@@ -29,6 +30,9 @@
         <input type="checkbox" name="answersimmediately" value="Yes" <?php echo ($form->review & QUIZ_REVIEW_ANSWERS & QUIZ_REVIEW_IMMEDIATELY) ? 'checked="checked"' : '' ?> />
       </td>
       <td align="center">
+        <input type="checkbox" name="feedbackallanswersimmediately" value="No" <?php echo ($form->review & QUIZ_REVIEW_FEEDBACK_ALLANSWERS & QUIZ_REVIEW_IMMEDIATELY) ? 'checked="checked"' : '' ?> />
+      </td>
+      <td align="center">
         <input type="checkbox" name="feedbackimmediately" value="Yes" <?php echo ($form->review & QUIZ_REVIEW_FEEDBACK & QUIZ_REVIEW_IMMEDIATELY) ? 'checked="checked"' : '' ?> />
       </td>
       <td align="center">
@@ -49,6 +53,9 @@
         <input type="checkbox" name="answersopen" value="Yes" <?php echo ($form->review & QUIZ_REVIEW_ANSWERS & QUIZ_REVIEW_OPEN) ? 'checked="checked"' : '' ?> />
       </td>
       <td align="center">
+        <input type="checkbox" name="feedbackallanswersopen" value="No" <?php echo ($form->review & QUIZ_REVIEW_FEEDBACK_ALLANSWERS & QUIZ_REVIEW_OPEN) ? 'checked="checked"' : '' ?> />
+      </td>
+      <td align="center">
         <input type="checkbox" name="feedbackopen" value="Yes" <?php echo ($form->review & QUIZ_REVIEW_FEEDBACK & QUIZ_REVIEW_OPEN) ? 'checked="checked"' : '' ?> />
       </td>
       <td align="center">
@@ -69,6 +76,9 @@
         <input type="checkbox" name="answersclosed" value="Yes" <?php echo ($form->review & QUIZ_REVIEW_ANSWERS & QUIZ_REVIEW_CLOSED) ? 'checked="checked"' : '' ?> />
       </td>
       <td align="center">
+        <input type="checkbox" name="feedbackallanswersclosed" value="No" <?php echo ($form->review & QUIZ_REVIEW_FEEDBACK_ALLANSWERS & QUIZ_REVIEW_CLOSED) ? 'checked="checked"' : '' ?> />
+      </td>
+      <td align="center">
         <input type="checkbox" name="feedbackclosed" value="Yes" <?php echo ($form->review & QUIZ_REVIEW_FEEDBACK & QUIZ_REVIEW_CLOSED) ? 'checked="checked"' : '' ?> />
       </td>
       <td align="center">
diff --git a/question/type/multichoice/questiontype.php b/question/type/multichoice/questiontype.php
index bae114f..e5285b0 100755
--- a/question/type/multichoice/questiontype.php
+++ b/question/type/multichoice/questiontype.php
@@ -310,9 +310,9 @@ class question_multichoice_qtype extends default_questiontype {
             }
             if (($options->feedback && $chosen) || $options->correct_responses) {
                 if ($type == ' type="checkbox" ') {
-                    $a->feedbackimg = question_get_feedback_image($answer->fraction > 0 ? 1 : 0, $chosen && $options->feedback);
+                    $a->feedbackimg = question_get_feedback_image($answer->fraction > 0 ? 1 : 0, $chosen && ($options->feedback || $options->feedbackallanswers));
                 } else {
-                    $a->feedbackimg = question_get_feedback_image($answer->fraction, $chosen && $options->feedback);
+                    $a->feedbackimg = question_get_feedback_image($answer->fraction, $chosen && ($options->feedback || $options->feedbackallanswers));
                 }
             }
 
@@ -321,7 +321,8 @@ class question_multichoice_qtype extends default_questiontype {
                     format_text($answer->answer, FORMAT_MOODLE, $formatoptions, $cmoptions->course);
 
             // Print feedback if feedback is on #MDL-10841
-            if (($options->feedback || $options->correct_responses) && ($checked || $options->readonly)) {
+            if ( (($options->feedback || $options->correct_responses) && ($checked || $options->feedbackallanswers)) 
+                || $options->feedbackallanswers ) {
                 $a->feedback = format_text($answer->feedback, true, $formatoptions, $cmoptions->course);
             } else {
                 $a->feedback = '';