Merge branch 'MDL-67042-master' of git://github.com/sarjona/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 26 Nov 2019 03:59:08 +0000 (11:59 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 26 Nov 2019 03:59:08 +0000 (11:59 +0800)

Trivial merge