MDL-42777 courses: Added behat to test ajax on course view page
Merge branch 'wip-MDL-40883-master' of git://github.com/marinaglancy/moodle
MDL-42711 import learnmoodle fixes: Fix the broken links in RSS feed block

If the <description> of the feed contains URLs longer than 30 characters, the
URL is split because of the break_up_long_words(). When combined with the
filter that converts URLs to links, this produces broken links.

The proper solution would be to improve break_up_long_words() so that it does
not modifies URLs at all. As a temporary solution for our purpose now is to
call format_text() prior to break_up_long_words() as it will not modify the
inner content of the <a> tag.

This should be fixed upstream. See also discussion at
https://moodle.org/mod/forum/discuss.php?d=34947
Merge branch 'wip-mdl-42777' of https://github.com/rajeshtaneja/moodle
Merge branch 'MDL-42743' of git://github.com/timhunt/moodle
MDLSITE-2455 Do not throw coding exception when the activity is not found

Under certain conditions, coding exception is thrown when fetching items from
the navigation bar. The patch prevents them. See more details in the tracker.
Merge branch 'MDL-42772-master' of git://github.com/FMCorz/moodle
MDLSITE-2493 glossary filter alert dialog button string now translatable

Conflicts:
	filter/glossary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker-debug.js
	filter/glossary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker-min.js
	filter/glossary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker.js
	filter/glossary/yui/src/autolinker/js/autolinker.js -- M.core.alert api was changed.
MDL-41775 mod_feedback - Input fields are shown with a fixed width on bootstrap based themes
MDL-42790 essay attempt on last: fix plain reponse mode

Plain responses, without files, were getting messed up by the
fix for MDL-39980. Something that looked like an HTML comment was being
appended.

This fix works by avoiding appending anything if there are no files. The
new unit test (which was failing before I fixed the code) confirms that
this works. The other tests should be enough to verify that there are no
regressions.
Merge branch 'MDL-36224-master' of git://github.com/damyon/moodle
MDL-36224 LTI: Whitespace fix
Merge branch 'MDL-39923_master' of https://github.com/totara/openbadges

Conflicts:
	version.php
MDL-42795 course: fixed param course in sql

course_sections has course field and not courseid, hence replaced it with course.
Merge branch 'wip-mdl-42754' of https://github.com/rajeshtaneja/moodle
MDL-40612 libraries: Unit test expansion for get_all_user_name_fields()

and the inclusion of tests for set_user_name_object()
MDL-40612 libraries: Tidy up and improvement of the code for additional name fields.

Includes an update to get_all_user_name_fields() and the inclusion of set_user_name_object()
MDL-42081 EditPDF: Add default stamp images
Merge branch 'MDL-42081-master-nomerge2' of git://github.com/mouneyrac/moodle
Merge branch 'MDL-42683-master-2' of git://github.com/mouneyrac/moodle

Conflicts:
	mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js