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

Trivial merge