MDL-20636 Merge remote-tracking branch 'moodle/master' into upgrade
Conflicts:
lib/filestorage/file_storage.php
mod/quiz/attemptlib.php
mod/quiz/lib.php
mod/quiz/mod_form.php
mod/quiz/report/overview/overview_table.php
mod/quiz/report/overview/report.php
mod/quiz/report/responses/report.php
mod/quiz/report/responses/responses_table.php
mod/quiz/report/statistics/db/install.xml
mod/quiz/report/statistics/qstats.php
mod/quiz/report/statistics/report.php
mod/quiz/report/statistics/statistics_question_table.php
mod/quiz/report/statistics/statistics_table.php
mod/quiz/report/statistics/version.php
mod/quiz/review.php
mod/quiz/reviewquestion.php
mod/quiz/startattempt.php
mod/quiz/styles.css
mod/quiz/view.php
question/type/essay/questiontype.php
question/type/match/backup/moodle2/backup_qtype_match_plugin.class.php
question/type/match/backup/moodle2/restore_qtype_match_plugin.class.php
question/type/numerical/display.html
question/type/numerical/questiontype.php
question/type/questiontype.php
question/type/random/questiontype.php
question/type/shortanswer/questiontype.php
theme/base/style/question.css
27 files changed:
