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

Trivial merge