Merge branch 'MDL-45627-master' of git://github.com/andrewnicols/moodle

diff --cc mod/forum/lib.php
index 8b00220,6bca679..8f7ce0e
--- 1/mod/forum/lib.php
--- 2/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@@ -23,10 -23,8 +23,9 @@@
  defined('MOODLE_INTERNAL') || die();
  
  /** Include required files */
 +require_once(__DIR__ . '/deprecatedlib.php');
  require_once($CFG->libdir.'/filelib.php');
  require_once($CFG->libdir.'/eventslib.php');
- require_once($CFG->dirroot.'/user/selector/lib.php');
  
  /// CONSTANTS ///////////////////////////////////////////////////////////