Merge branch 'MDL-67233-master' of git://github.com/peterRd/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 30 Dec 2019 04:50:52 +0000 (12:50 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Mon, 30 Dec 2019 04:50:52 +0000 (12:50 +0800)

Trivial merge