Merge branch 'MDL-42542-master' of git://github.com/FMCorz/moodle

Conflicts:
	version.php
Merge branch 'wip-MDL-41337-master' of git://github.com/marinaglancy/moodle
Merge branch 'MDL-42579_m26_2' of git://github.com/sbourget/moodle
Merge branch 'MDL-41251_c' of git://github.com/rwijaya/moodle
Merge branch 'MDL-42574-master' of git://github.com/ankitagarwal/moodle
Merge branch 'MDL-42284_behat' of https://github.com/andyjdavis/moodle
Merge branch 'MDL-42558-master' of git://github.com/ankitagarwal/moodle
Merge branch 'wip-MDL-42379-master' of git://github.com/abgreeve/moodle
MDL-42236 Filepicker: fixing search box for repositories

Conflicts:
	theme/bootstrapbase/style/moodle.css
MDL-42236 behat: New steps to look for elements visibility
MDL-41092 Assign: Expose SQL error in cron unit test
Merge branch 'MDL-41092-master' of git://github.com/ankitagarwal/moodle
ie9 svg compatibility fixes
Merge branch 'MDL-38734-master' of git://github.com/danpoltawski/moodle
MDL-42102 tinymce: improved icons
Merge branch 'MDL-42102-master' of git://github.com/andrewnicols/moodle
MDL-42102 TinyMCE: Correct  additional icons
Merge branch 'MDL-41664_master' of https://github.com/markn86/moodle
MDL-42589: Fix file picker display in ie9/ie10

CSS change to fix blank file picker bug in IE.
Merge branch 'MDL-42589-master' of git://github.com/damyon/moodle