Merge branch 'wip-mdl-41000' of git://github.com/rajeshtaneja/moodle

diff --cc lib/classes/event/base.php
index 0fb3b4e,ecd42e3..1dc08ed
--- 1/lib/classes/event/base.php
--- 2/lib/classes/event/base.php
+++ b/lib/classes/event/base.php
@@@ -240,9 -238,9 +238,9 @@@ abstract class base implements \Iterato
       */
      public static function get_name() {
          // Override in subclass with real lang string.
 -        $parts = explode('\\', __CLASS__);
 +        $parts = explode('\\', get_called_class());
          if (count($parts) !== 3) {
-             return 'unknown event';
+             return get_string('unknownevent', 'error');
          }
          return $parts[0].': '.str_replace('_', ' ', $parts[2]);
      }

diff --cc lib/classes/event/user_loggedin.php
Simple merge