MDL-39189 badges: Allow users with multiple roles choose their role when awarding a badge
MDL-39209 badges: Fix course badges page access and navigation when course badges are disabled
MDL-39595 theme_bootstrapbase: Renamed renderers/core.php to renderers/core_renderer.php
MDL-39581 forms: prevent calendar popup from changing multiple date elements
MDL-39604 course: Reformat section edit form
MDL-39609 grade: Notice during import and calculation
MDL-39611 url: Fix setType warnings in module settings
MDL-39526 cache: purged when upgrade finished
MDL-39606 question: Fix missing setType warnings
Merge branch 'MDL-39595_master' of git://github.com/lazydaisy/moodle
Merge branch 'wip-MDL-39526-m25-p2' of git://github.com/samhemelryk/moodle
Merge branch 'MDL-39611-master-int' of git://github.com/FMCorz/moodle
Merge branch 'MDL-39609-master-int' of git://github.com/FMCorz/moodle
Merge branch 'MDL-39606-master-int' of git://github.com/FMCorz/moodle
Merge branch 'MDL-39581_master' of https://github.com/markn86/moodle
Merge branch 'MDL-39209_master' of git://github.com/totara/openbadges
Merge branch 'MDL-39189_master' of git://github.com/totara/openbadges
MDL-39642 Merge English strings from the en_fix language pack
Merge branch 'MDL-39604-master-int' of git://github.com/FMCorz/moodle
Merge branch 'MDL-39642-en_fix' of git://github.com/mudrd8mz/moodle

Conflicts:
	lang/en/badges.php