Merge branch 'MDL-65549_master' of git://github.com/dmonllao/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 23 May 2019 02:09:09 +0000 (10:09 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 23 May 2019 02:09:09 +0000 (10:09 +0800)

Trivial merge