Merge branch 'MDL-66237-master' of git://github.com/mickhawkins/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Tue, 21 Jan 2020 03:08:27 +0000 (11:08 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Tue, 21 Jan 2020 03:08:27 +0000 (11:08 +0800)

Trivial merge