Merge branch 'MDL-40447_M25' of https://github.com/nadavkav/moodle into MOODLE_25_STABLE
Merge branch 'MDL-40877-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE
Merge branch 'MDL-38765_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE
MDL-38765 quiz: fix incorrect comment
Merge branch 'MDL-41321_M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE

Conflicts:
	theme/bootstrapbase/style/moodle.css
Merge branch 'MDL-41401-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE
MDL-39682 Forms, File Picker, Themes: Fix alignment of Form's Labels and Input elements in RTL mode (theme/clean)

Conflicts:
	theme/bootstrapbase/style/moodle.css
Merge branch 'wip-MDL-41127-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE
Merge branch 'MDL-41366_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE
Merge branch 'm25_MDL-41410_Move_Comment_To_Appropriate_Place' of https://github.com/scara/moodle into MOODLE_25_STABLE
Merge branch 'MDL-41387_m25' of https://github.com/markn86/moodle into MOODLE_25_STABLE
Automatically generated installer lang files
MDL-41317 Set correct context to send bulk message page
MDL-40214 mod_assign: Fixed issue with custom scale being lost during restore.
MDL-41249 assign: Fix incorrect gradingform restore step

The mapping in the previous patch was wrong - mod assign uses
the area "submissions" but the itemid is the grade->id not the submission->id.
MDL-41348 question code depends on filelib.

I think this used to work because mod/forum/lib.php used to be included
everywhere, and in turn included lib/formslib.php. We should declare the
dependencey explicitly.
MDL-36093 grade export: Fix HTML special characters printed litteraly.
MDL-41213 theme_bootstrapbase: fixed license filemanager overflow

Conflicts:
	theme/bootstrapbase/style/moodle.css
MDL-39682 Forms, File Picker, Themes: Fix alignment of Form's Labels and Input elements in RTL mode (theme/clean)

Conflicts:
	theme/bootstrapbase/style/moodle.css
MDL-32690: Restore 1.9 backup into 2.X fails on missing assignment type

Solution is as follows:
* Allow unsupported subplugins to convert from Moodle1 to Moodle2
* On Moodle2 restore hide unsupported subplugins
* Graceful error message in assignment of unsupported subplugins