Merge branch 'MDL-31616_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Revert "MDL-33117 Whitespace fixes"

This reverts commit 5696c69b3b3e18d1198cc6c0fb5683134d16e374.
Revert "MDL-33117 grade: adding unit tests for the user report function inject_rowspans()"

This reverts commit b65bd8b65825e1a0ef4e6dcc5280381433930495.
Merge branch 'MDL-37354-stable23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE
Merge branch 'MDL-37173-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE
Merge branch 'wip-MDL-35818-stable23' of git://github.com/phalacee/moodle into MOODLE_23_STABLE
Automatically generated installer lang files
Merge branch 'MDL-37313_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE
MDL-37313 question: fix trailing whitespace
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.
Merge branch 'MDL-36412-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE
MDL-31484 backup - repeated restores with anonymised users now works correctly
MDL-37527 Assignment - Change query for print_overview so it uses an index (postgres)

Reported by Mark Neilsen.

Conflicts:

	mod/assign/lib.php
MDL-35873 Blocks: Made alt-text on block control icons more descriptive

Conflicts:
	lib/blocklib.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-37374 questions: fix property_exists calls.
MDL-31616 blocks: ensure showinsubcontexts is only 0 or 1 in the DB.
MDL-37555 Apply realpath() 2 CFG->phpunit_dataroot
Merge branch 'MDL-37374_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
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