MDL-35185 import Flowplayer 3.2.14
MDL-37355 Fix the REST server that didn't send back the cleaned values
MDL-35074: grader report - Ease limit on number of students per page

The limit imposed by max_input_vars "applies only to each nesting level of
a multi-dimensional input array"
(http://www.php.net/manual/en/info.configuration.php#ini.max-input-vars).

Turning the grader report fields into arrays (they were all top-level form
fields, i.e. elements of the top-level array) makes the number of students
become the only limiting factor, thereby allowing us to relax the limit on
number of students per page greatly (to 1 less than max_input_vars, for
safety).
MDL-34435 reports: Log category actions

Conflicts:

	course/lib.php
	version.php
MDL-34050: Lesson module: fixed matching answer format to use text
MDL-34050 Lesson module: Fixed undefined variable for $qtype
MDL-34050 Lesson Module: improved matching question logic for checking user response.  This patch will also resolved MDL-36343.
MDL-27164 groups Do not show multiple instances of the same role as multiple
MDL-15930 - admin: reorganize logic to allow ->fullnamedisplay to be used as default sort.
MDL-36674 Administration: out_as_local_url will check for both http and https url's

out_as_local_url will first check if url passed in wwwroot, if it's not then it will check
if loginhttps is enabled and url is httpswwwroot
MDL-37430 Course - Make modules created in hidden sections visible when section is made visible.

Conflicts:

	course/lib.php
MDL-34050 Lesson Module: Fixed spacing and removed array_unique() for responses
MDL-36421 SCORM: fix SCORM course format new window popups
MDL-37339 Administration: Unique custom profile should not be checked if it's empty.

Currently we have two options for custom profile fields 'Unique' and 'Required'
If value s not entered for unique and not required field then we should allow
duplicate empty values. If value is entered then we should check for unique input.
In case field is unique and required then it should be always checked as required
field can't be empty.
MDL-37527 Assignment - Change query for print_overview so it uses an index (postgres)

Reported by Mark Neilsen.

Conflicts:

	mod/assign/lib.php
MDL-32526 Course: After creating course user should be redirected to newly created course

After creating a new course if user has capability to enrol users then
enrol user page should be visible else user should see newly created course
MDL-37543 Assignment upgrade: convert advanced upload files "Send for marking" setting

Advanced upload files assignment type has "Enable send for marking" setting instead
of "Allow resubmissions". Needs special handling in upgrade code to convert to
"Require students click submit button".

Conflicts:

	mod/assign/submission/file/locallib.php
MDL-36757 course: avoid accidently overwriting the hidden/visible values set on grade items
MDL-37540 Assignment upgrade: Upgrade setting "Hide description before due date"

Advanced upload of files has this setting which is stored in var3.
MDL-37539 Assignment upgrade: Disable submission comments if allow notes was not enabled.

For advanced upload of files only - this setting was stored in var2.

Conflicts:

	mod/assign/submission/comments/locallib.php