Merge branch 'MDL-65050-master-fix' of git://github.com/lameze/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 1 Apr 2019 08:05:34 +0000 (16:05 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Mon, 1 Apr 2019 08:05:34 +0000 (16:05 +0800)

Trivial merge