Merge branch 'MDL-42526-26' of git://github.com/jamiepratt/moodle into MOODLE_26_STABLE
Merge branch 'MDL-45607_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE
Merge branch 'm26_MDL-45623' of git://github.com/totara/moodle into MOODLE_26_STABLE
Merge branch 'MDL-45635-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

Conflicts:
	lib/yui/src/notification/js/confirm.js
Merge branch 'MDL-45686_26' of git://github.com/jmvedrine/moodle into MOODLE_26_STABLE
Merge branch 'MDL-45660_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE
Merge branch 'MDL-45192_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE
Merge branch 'MDL-45650_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE
MDL-45675 mod_data: initialise options as an empty array to avoid error when there are none
MDL-33763 notes: Fix issue with incorrect node highlighting in the nav tree
Merge branch 'MDL-44014-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE
Merge branch '45499-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE
MDL-45661 Assign: Clean bad data from DB after MDL-42526

Conflicts:
	mod/assign/db/upgrade.php
	mod/assign/version.php
Merge branch 'wip-MDL-45688-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE
MDL-44482 mod_lti: use localized dates

Fixed an issue where LTI external tools had creation datestamps of NaN/NaN/NaN under particular non-English languages.
MDL-45544 events: Add event user_profile_viewed trigger to user/profile.php
Merge branch 'MDL-44482-26' of git://github.com/jethac/moodle into MOODLE_26_STABLE
Merge branch 'MDL-45661-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE
Merge branch 'MDL-45675_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE
Merge branch 'MDL-45676_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE