Merge branch 'MDL-69206-39' of git://github.com/mihailges/moodle into MOODLE_39_STABLE
authorJake Dallimore <jake@moodle.com>
Wed, 15 Jul 2020 02:29:28 +0000 (10:29 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 15 Jul 2020 02:29:28 +0000 (10:29 +0800)

Trivial merge