Merge branch 'MDL-65633_master' of git://github.com/dmonllao/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Tue, 23 Jul 2019 06:09:19 +0000 (14:09 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 25 Jul 2019 06:41:15 +0000 (14:41 +0800)

Trivial merge