Merge branch 'MDL-65699-master' of http://github.com/dravek/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 27 May 2019 06:52:13 +0000 (14:52 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Mon, 27 May 2019 06:52:13 +0000 (14:52 +0800)

Trivial merge