Merge branch 'MDL-65067_master' of https://github.com/dmonllao/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 22 May 2019 08:29:52 +0000 (16:29 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 22 May 2019 08:29:52 +0000 (16:29 +0800)

Trivial merge