Merge branch 'MDL-52868-master' of git://github.com/jleyva/moodle

diff --cc mod/quiz/version.php
index 8fdc707,8bcb06f..96623a8
--- 1/mod/quiz/version.php
--- 2/mod/quiz/version.php
+++ b/mod/quiz/version.php
@@@ -24,7 -24,7 +24,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $plugin->version   = 2016032103;
 -$plugin->version   = 2015111612;
++$plugin->version   = 2016032104;
  $plugin->requires  = 2015111000;
  $plugin->component = 'mod_quiz';
  $plugin->cron      = 60;