Merge branch 'MDL-69065-master' of git://github.com/peterRd/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 24 Jun 2020 01:30:31 +0000 (09:30 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 24 Jun 2020 02:11:08 +0000 (10:11 +0800)

Trivial merge