Merge branch 'MDL-65705-master' of git://github.com/sarjona/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Tue, 28 May 2019 08:27:29 +0000 (16:27 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Tue, 28 May 2019 08:27:29 +0000 (16:27 +0800)

Trivial merge