Merge branch 'MDL-60936_master' of git://github.com/dmonllao/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 20 Mar 2019 06:50:46 +0000 (14:50 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 20 Mar 2019 06:50:46 +0000 (14:50 +0800)

Trivial merge