Merge branch 'MDL-65404-master' of https://github.com/aanabit/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Tue, 20 Aug 2019 02:13:31 +0000 (10:13 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Tue, 20 Aug 2019 02:13:31 +0000 (10:13 +0800)

Trivial merge