Merge branch 'MDL-66021-master' of git://github.com/peterRd/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Tue, 23 Jul 2019 01:11:14 +0000 (09:11 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 25 Jul 2019 06:41:14 +0000 (14:41 +0800)

Trivial merge