Merge branch 'MDL-69135-master' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 9 Jul 2020 02:35:33 +0000 (10:35 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 9 Jul 2020 02:35:33 +0000 (10:35 +0800)

Trivial merge