MDL-41146 Backup: backup_includes_files can leak memory
MDL-41418 Administration: Page context should be set before setting page title
MDL-41369 Set proper context and navigation path for user messages
MDL-41485 calendar: Replace value of action buttons on managesubscription page with int
MDL-41456 Events: Fixed existing events to respect base event access specifier and return data type
MDL-41267 add support for subplugins in admin tools
MDL-28579 SCORM: coding guideline fixes
MDL-40566 behat: Adding behat_selectors

Class that manages moodle selectors transition
to behat default selectors.
MDL-40566 behat: Moving from behat_command to behat_selectors
MDL-40566 behat: Adding info about the deprecated attr.
MDL-40566 behat: Update features using the new options
MDL-41395 improved phpdoc's for coursecatlib.php
MDL-41395 Improved phpdocs for coursecatlib.php
MDL-41568 Merge English strings from the en_fix language pack
Merge branch 'MDL-41568-en_fix' of git://github.com/mudrd8mz/moodle
Merge branch 'MDL-40566_master' of git://github.com/dmonllao/moodle
MDL-28579 SCORM: use filemanager instead of old file picker
Merge branch 'MDL-41146-master' of git://github.com/sammarshallou/moodle
Merge branch 'w36_MDL-41267_m26_toolsubplugins' of https://github.com/skodak/moodle

Conflicts:
	lib/upgrade.txt
MDL-41267 fix phpunit tests