Merge branch 'MDL-66020-master' of git://github.com/marinaglancy/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 16 Oct 2019 00:37:07 +0000 (08:37 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 16 Oct 2019 00:37:07 +0000 (08:37 +0800)

Trivial merge