Merge branch 'wip-MDL-37592_master' of git://github.com/lazydaisy/moodle
Merge branch 'wip-MDL-37591_master' of git://github.com/lazydaisy/moodle
MDL-36104 mod_assign: added hidden labels to the feedback input fields
MDL-37541 Wikimedia returns more information about images
MDL-37375 Report: fixed blog post link from course activity report
Merge branch 'MDL-37571' of git://github.com/tmuras/moodle
Merge branch 'w03_MDL-37559_m25_otherusers' of git://github.com/skodak/moodle
MDL-35357 Lesson Module: fixed undefined property for $answerformat
MDL-37593 use https for editor script if required
MDL-37585 Make $DB->set_debug(true) show run time of each query.
Merge branch 'wip-MDL-37541-master' of git://github.com/marinaglancy/moodle
MDL-37599 question import: add missing string.

AMOS BEGIN
 MOV [matcherror,question],[invalidgrade,question]
AMOS END
MDL-37577 quiz overdue handling: optimise database query

This is the standard trick of adding a redundant WHERE clause to a
subquery to help the database realise that it does not have to inspect
so many rows.
Merge branch 'MDL-34050' of git://github.com/rwijaya/moodle
Merge branch 'MDL-35924_master' of https://github.com/markn86/moodle
Merge branch 'MDL-37577' of git://github.com/timhunt/moodle
Merge branch 'w03_MDL-36411_m25_setup' of git://github.com/skodak/moodle
Merge branch 'MDL-37563-master' of git://github.com/damyon/moodle
Merge branch 'MDL-29749-master-4th' of git://github.com/FMCorz/moodle
MDL-37611 block/completionstatus: changed 2 insances of generalbox class to generaltable class in details.php