MDL-30515 grade Removing duplicate values to avoid upgrade to 2.x crash
MDL-32931 mod_forum Change forum overview to avoid use of (potentially large and slow ) log table.
MDL-32931 mod_forum Polishing patch and taking into account courses without previous accesses
MDL-32499 gradingform_rubric Avoid backup/restore of rubric fillings without an existing criteria
MDL-34507 Filepicker: Repositories with specific filetypes are displayed when expected
MDL-25953 Repository: Updated Amazon S3 library

Conflicts:

	repository/s3/lib.php
MDL-25953 Repository: Amazon S3 supports sub directories

Conflicts:

	repository/s3/lib.php
MDL-32827 calendar: Fixining calender entries with no eventtype
MDL-32827 calendar: bumping the version
MDL-32827 calendar: Added logic to handle calendar events with empty eventtypes during restore
MDL-34239 Blog: Editing blog associated with module will be keep it's association
MDL-34599 quiz attempts: more robust if page number out of range.

Rather than throwing an exception, we should just show the first/last
page of the quiz if the page number is out-of-range.
MDL-34483 qformat_examview: changes required to make it basically work.
MDL-34483 qformat_examview: clean the code to make codechecker happy
MDL-34483 qformat_examview: handle more questions.

These fixes come from testing with the example file supplied by Rick
Jerz.
MDL-32791 quiz db: clean up garbage data that was causing problems.

Melinda Kraft reported having rows in their quiz_question_instances
table which caused various problems. These rows are meaningless, so I
have done a DB upgrade step to clean them up, which should deal with the
bad side-effets they were causing.
MDL-34538 fix PARAM_FLOAT validation
MDL-31509 quiz outcomes: let people associate quizzes with outcomes.

The quiz does not really support outcomes, but even so in 1.9 you could
select outcomes on the quiz edit form, and apparently this was useful to
some people, therefore we should re-enable it.
MDL-32712 assignment: convert default format value during upgrade
MDL-34624 theme_base: added background-color to style/admin.css for role edit default