Merge branch 'MDL-68761-master' of git://github.com/bmbrands/moodle
authorJake Dallimore <jake@moodle.com>
Fri, 5 Jun 2020 02:23:13 +0000 (10:23 +0800)
committerJake Dallimore <jake@moodle.com>
Fri, 5 Jun 2020 02:23:13 +0000 (10:23 +0800)

Trivial merge