Merge branch 'MDL-58992_master' of git://github.com/dmonllao/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 10 Sep 2019 05:40:23 +0000 (13:40 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 10 Sep 2019 05:40:23 +0000 (13:40 +0800)

Trivial merge