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

Trivial merge