Merge branch 'MDL-65484-master' of git://github.com/damyon/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 8 May 2019 03:21:59 +0000 (11:21 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 8 May 2019 03:21:59 +0000 (11:21 +0800)

Trivial merge