Merge branch 'MDL-68438_310' of https://github.com/t-schroeder/moodle into MOODLE_310...
authorJake Dallimore <jake@moodle.com>
Thu, 22 Oct 2020 01:30:48 +0000 (09:30 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 22 Oct 2020 01:30:48 +0000 (09:30 +0800)

Trivial merge