Merge branch 'MDL-68215-master' of git://github.com/lucaboesch/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 17 Jun 2020 06:57:42 +0000 (14:57 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 17 Jun 2020 06:57:42 +0000 (14:57 +0800)

Trivial merge