Merge branch 'MDL-67672-master' of git://github.com/lucaboesch/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 1 Apr 2020 08:43:03 +0000 (16:43 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 1 Apr 2020 08:43:03 +0000 (16:43 +0800)

Trivial merge