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

Trivial merge