MDL-40825 behat: Giving time to display the ajax response
MDL-38758 mod_forum: fixed issue where pass by reference removal caused an undefined variable error
MDL-40937 mod_assign - remove debugging code from 'previous submissions' javascript, that was breaking in IE8/IE9
MDL-35922 - Adding aria attributes to create-folder modal
MDL-35927 filepicker: add aria attribute to display modal error
MDL-40997 phpunit: Assertions for events legacy data
Merge branch 'MDL-35927' of git://github.com/rwijaya/moodle
Merge branch 'MDL-40825_master' of git://github.com/dmonllao/moodle
Merge branch 'MDL-35922-master' of git://github.com/phalacee/moodle
Merge branch 'MDL-38758_master' of https://github.com/markn86/moodle
Merge branch 'MDL-40937_assignment_history' of git://github.com/davosmith/moodle
Merge branch 'MDL-30852-master' of git://github.com/damyon/moodle
MDL-40684 Fix conditional field name for custom user fields
Merge branch 'MDL-36011-master' of git://github.com/damyon/moodle
MDL-41029 core: Fix wrong guessing of course id in event base
Merge branch 'MDL-40997-master' of git://github.com/FMCorz/moodle
Merge branch 'MDL-41029-master' of git://github.com/FMCorz/moodle
MDL-40668 tinymce: Remove collapsable editor options

We have an alternative (pdw toolbars)
MDL-40668 question types: properly deprecate get_non_collapsible_editor_options