Merge branch 'MDL-66455-master' of git://github.com/lameze/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 5 Nov 2019 03:42:48 +0000 (11:42 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 5 Nov 2019 03:42:48 +0000 (11:42 +0800)

Trivial merge