Merge branch 'MDL-67703-master' of git://github.com/lameze/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 23 Jan 2020 03:09:05 +0000 (11:09 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 23 Jan 2020 07:11:02 +0000 (15:11 +0800)

Trivial merge