Merge branch 'MDL-67903-master' of git://github.com/bmbrands/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 28 May 2020 05:58:50 +0000 (13:58 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 28 May 2020 05:58:50 +0000 (13:58 +0800)

Trivial merge