Merge branch 'MDL-59393-master-2' of git://github.com/ryanwyllie/moodle

diff --cc calendar/classes/external/event_exporter.php
index 56c3473,82fc512..917f07e
--- 1/calendar/classes/external/event_exporter.php
--- 2/calendar/classes/external/event_exporter.php
+++ b/calendar/classes/external/event_exporter.php
@@@ -90,15 -83,10 +89,13 @@@ class event_exporter extends event_expo
      protected function get_other_values(renderer_base $output) {
          $values = parent::get_other_values($output);
  
 +        global $CFG;
 +        require_once($CFG->dirroot.'/course/lib.php');
 +
          $event = $this->event;
-         $legacyevent = container::get_event_mapper()->from_event_to_legacy_event($event);
- 
          $context = $this->related['context'];
          $values['isactionevent'] = false;
 -
 +        $values['iscourseevent'] = false;
          if ($moduleproxy = $event->get_course_module()) {
              $modulename = $moduleproxy->get('modname');
              $moduleid = $moduleproxy->get('id');

diff --cc version.php
index 88c4bc4,b63e633..13128ed
--- 1/version.php
--- 2/version.php
+++ b/version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2017082200.01;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2017082100.00;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2017082300.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.