Merge branch 'wip-MDL-44467-master' of git://github.com/abgreeve/moodle

diff --cc admin/tool/messageinbound/classes/manager.php
index 0e26c58,fb0c048..fe33923
--- 1/admin/tool/messageinbound/classes/manager.php
--- 2/admin/tool/messageinbound/classes/manager.php
+++ b/admin/tool/messageinbound/classes/manager.php
@@@ -930,8 -930,7 +930,8 @@@ class manager 
          $userfrom->customheaders[] = 'In-Reply-To: ' . $messageid;
  
          // The message will be sent from the intended user.
-         $eventdata->userfrom            = \core_user::get_support_user();
 +        $eventdata->courseid            = SITEID;
+         $eventdata->userfrom            = \core_user::get_noreply_user();
          $eventdata->userto              = $USER;
          $eventdata->subject             = $this->get_reply_subject($this->currentmessagedata->envelope->subject);
          $eventdata->fullmessage         = get_string('invalidrecipientdescription', 'tool_messageinbound', $this->currentmessagedata);

diff --cc enrol/paypal/ipn.php
Simple merge

diff --cc lang/en/admin.php
Simple merge

diff --cc lang/en/auth.php
Simple merge

diff --cc lib/db/upgrade.php
index 6e780e6,d2b674b..7a2adeb
--- 1/lib/db/upgrade.php
--- 2/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@@ -2299,20 -2299,13 +2299,28 @@@ function xmldb_main_upgrade($oldversion
          upgrade_main_savepoint(true, 2016101401.02);
      }
  
 -    if ($oldversion < 2016102700.01) {
 +    if ($oldversion < 2016110202.00) {
 +
 +        // Force uninstall of deleted authentication plugin.
 +        if (!file_exists("$CFG->dirroot/auth/radius")) {
 +            // Leave settings inplace if there are radius users.
 +            if (!$DB->record_exists('user', array('auth' => 'radius', 'deleted' => 0))) {
 +                // Remove all other associated config.
 +                unset_all_config_for_plugin('auth/radius');
 +                // The version number for radius is in this format.
 +                unset_all_config_for_plugin('auth_radius');
 +            }
 +        }
 +        upgrade_main_savepoint(true, 2016110202.00);
 +    }
 +
++    if ($oldversion < 2016110300.00) {
+         // Remove unused admin email setting.
+         unset_config('emailonlyfromreplyaddress');
+ 
+         // Main savepoint reached.
 -        upgrade_main_savepoint(true, 2016102700.01);
++        upgrade_main_savepoint(true, 2016110300.00);
+     }
+ 
      return true;
  }

diff --cc lib/moodlelib.php
Simple merge

diff --cc lib/tests/message_test.php
Simple merge

diff --cc lib/tests/messagelib_test.php
Simple merge

diff --cc mod/forum/lib.php
Simple merge

diff --cc version.php
index c113e4a,5ccdc4e..94a8cf1
--- 1/version.php
--- 2/version.php
+++ b/version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2016110202.01;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2016102700.01;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2016110300.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.