Merge branch 'MDL-58413-master-take2' of git://github.com/lucaboesch/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 25 Mar 2020 00:04:47 +0000 (08:04 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 25 Mar 2020 00:04:47 +0000 (08:04 +0800)

Trivial merge