Merge branch 'MDL-64787_master' of git://github.com/dmonllao/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Tue, 12 Mar 2019 03:16:20 +0000 (11:16 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Tue, 12 Mar 2019 03:16:20 +0000 (11:16 +0800)

Trivial merge