Merge branch 'MDL-38194-master' of git://github.com/sammarshallou/moodle

Conflicts:
	lib/upgrade.txt

diff --cc lib/filelib.php
Simple merge

diff --cc lib/upgrade.txt
index 2c4c045,0450eb2..4d47d06
--- 1/lib/upgrade.txt
--- 2/lib/upgrade.txt
+++ b/lib/upgrade.txt
@@@ -32,9 -32,7 +32,10 @@@ information provided here is intended e
    get_fast_modinfo(). Purging all caches and every core upgrade purges course modinfo cache as well.
    If function get_fast_modinfo() is called for multiple courses make sure to include field cacherev in course
    object.
 +* Internal (noreply and support) user support has been added for sending/receiving message.
 +  Use core_user::get_noreply_user() and core_user::get_support_user() to get noreply and support user's respectively.
 +  Real users can be used as noreply/support users by setting $CFG->noreplyuserid and $CFG->supportuserid
+ * New function readfile_allow_large() in filelib.php for use when very large files may need sending to user.
  
  DEPRECATIONS:
  Various previously deprecated functions have now been altered to throw DEBUG_DEVELOPER debugging notices