Merge branch 'MDL-66936-master' of git://github.com/marinaglancy/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 10 Dec 2019 07:26:41 +0000 (15:26 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 10 Dec 2019 07:26:41 +0000 (15:26 +0800)

Trivial merge