MDL-34586 assignment: convert default format value during restore
MDL-34612 forum: convert default format value during restore
Merge branch 'wip-MDL-42141-master' of git://github.com/marinaglancy/moodle
Merge branch 'MDL-42069' of https://github.com/appalachianstate/moodle
MDL-16073 add test for connection to external database for authentication and enrolments
Merge branch 'MDL-41956_master' of https://github.com/totara/openbadges
Merge branch 'w41_MDL-16073_m26_extdbtest_i' of https://github.com/skodak/moodle
MDL-41792 fix calendar test typos
MDL-40493 question: set real $USER before testing question walktrough
Merge branch 'wip-MDL-42068-m26-showshortnamefilepicker' of git://github.com/henesnarfel/moodle
Merge branch 'MDL-41761-master' of git://github.com/jamiepratt/moodle
Merge branch 'MDL-41940' of https://github.com/merrill-oakland/moodle
Merge branch 'MDL-42026-master' of git://github.com/damyon/moodle

Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
Merge branch 'MDL-29663_alt' of https://github.com/merrill-oakland/moodle
Merge branch 'mdl41908-master' of https://github.com/tlock/moodle
Merge branch 'wip-MDL-42089-master' of git://github.com/abgreeve/moodle
MDL-37153 - assign: Obey grade display settings in submission status

The assignment submission status screen was ignoring the grade item's
display setting, showing scores even if it's set to display letters only.
Merge branch 'wip-MDL-42016-master' of git://github.com/marinaglancy/moodle

Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
MDL-41993 Atto: Always clean/update the textarea when the content is changed
Merge branch 'MDL-41230-master' of git://github.com/FMCorz/moodle