Merge branch 'MDL-40405-master' of git://github.com/FMCorz/moodle

Conflicts:
	lib/upgrade.txt

diff --cc lib/upgrade.txt
index d4f755c,614a275..d3040b5
--- 1/lib/upgrade.txt
--- 2/lib/upgrade.txt
+++ b/lib/upgrade.txt
@@@ -11,7 -11,7 +11,8 @@@ information provided here is intended e
  * get_system_context() is deprecated, please use context_system::instance().
  * get_parent_contexts() is deprecated, please use $context->get_parent_context_ids().
  * get_parent_contextid() is deprecated, please use $context->get_parent_context().
+ * get_child_contexts() is deprecated, please use $context->get_child_contexts().
 +* Use new function moodleform::mock_submit() to simulate form submission in unit tests (backported).
  
  === 2.5.1 ===