Merge remote-tracking branch 'moodle/master' into MDL-20636_master_new_question_engine

Conflicts:
	lib/db/upgrade.php
	mod/quiz/lib.php

diff --cc backup/moodle2/backup_stepslib.php
Simple merge

diff --cc backup/moodle2/restore_stepslib.php
Simple merge

diff --cc lib/db/install.xml
Simple merge

diff --cc mod/quiz/lib.php
index f919522,5524773..ccac9d5
--- 1/mod/quiz/lib.php
--- 2/mod/quiz/lib.php
+++ b/mod/quiz/lib.php
@@@ -364,9 -379,18 +364,18 @@@ function quiz_user_outline($course, $us
          $grade = reset($grades->items[0]->grades);
      }
  
 -    $result = new stdClass;
 +    $result = new stdClass();
      $result->info = get_string('grade') . ': ' . $grade->str_long_grade;
-     $result->time = $grade->dategraded;
+ 
+     //datesubmitted == time created. dategraded == time modified or time overridden
+     //if grade was last modified by the user themselves use date graded. Otherwise use date submitted
+     //TODO: move this copied & pasted code somewhere in the grades API. See MDL-26704
+     if ($grade->usermodified == $user->id || empty($grade->datesubmitted)) {
+         $result->time = $grade->dategraded;
+     } else {
+         $result->time = $grade->datesubmitted;
+     }
+ 
      return $result;
  }