Merge branch 'MDL-66761-master' of git://github.com/mickhawkins/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 20 Jan 2020 06:40:19 +0000 (14:40 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Mon, 20 Jan 2020 06:40:19 +0000 (14:40 +0800)

Trivial merge