Merge branch 'MDL-65726-master' of git://github.com/marinaglancy/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 29 May 2019 03:06:30 +0000 (11:06 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 29 May 2019 03:06:30 +0000 (11:06 +0800)

Trivial merge