Merge branch 'MDL-64739_master-fix' of git://github.com/dmonllao/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 22 Oct 2019 03:13:43 +0000 (11:13 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 22 Oct 2019 03:13:43 +0000 (11:13 +0800)

Trivial merge